Commit 3ef42b98896777d09599f5afd02d93161f400b0b
2002-08-26T08:57:04
Removed std::vector
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/include/FTGlyphContainer.h b/include/FTGlyphContainer.h
index deda022..8ee03ce 100755
--- a/include/FTGlyphContainer.h
+++ b/include/FTGlyphContainer.h
@@ -1,14 +1,13 @@
#ifndef __FTGlyphContainer__
#define __FTGlyphContainer__
-#include <vector>
-
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
#include "FTGL.h"
-#include "FTGlyph.h" // for FTBBox
+#include "FTVector.h"
+#include "FTGlyph.h"
class FTFace;
@@ -109,7 +108,8 @@ class FTGL_EXPORT FTGlyphContainer
/**
* A structure to hold the glyphs
*/
- std::vector<FTGlyph*> glyphs;
+ typedef FTVector<FTGlyph*> GlyphVector;
+ GlyphVector glyphs;
/**
* Current error code. Zero means no error.
diff --git a/src/FTGlyphContainer.cpp b/src/FTGlyphContainer.cpp
index d060032..f43e406 100755
--- a/src/FTGlyphContainer.cpp
+++ b/src/FTGlyphContainer.cpp
@@ -2,6 +2,7 @@
#include "FTGlyph.h"
#include "FTFace.h"
+#include "mmgr.h"
FTGlyphContainer::FTGlyphContainer( FTFace* f, unsigned int g, bool p)
: preCache( p),
@@ -16,7 +17,7 @@ FTGlyphContainer::FTGlyphContainer( FTFace* f, unsigned int g, bool p)
FTGlyphContainer::~FTGlyphContainer()
{
- vector<FTGlyph*>::iterator iter;
+ GlyphVector::iterator iter;
for( iter = glyphs.begin(); iter != glyphs.end(); ++iter)
{
if( *iter)