mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-30 05:40:06 +00:00
35 lines
1.6 KiB
C++
35 lines
1.6 KiB
C++
--- src/drawlib/DrawLibOpenGL.cpp.orig 2011-10-11 20:18:26 UTC
|
|
+++ src/drawlib/DrawLibOpenGL.cpp
|
|
@@ -80,7 +80,7 @@ public:
|
|
/* a glyph from other glyphs */
|
|
/*kejo:why not just grrr create a copy contructor*/
|
|
GLFontGlyph(const std::string& i_value,
|
|
- HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str>& i_glyphsLetters);
|
|
+ HashNamespace::hash_map<std::string, GLFontGlyphLetter*>& i_glyphsLetters);
|
|
virtual ~GLFontGlyph();
|
|
|
|
std::string Value() const;
|
|
@@ -132,11 +132,11 @@ public:
|
|
private:
|
|
std::vector<std::string> m_glyphsKeys;
|
|
std::vector<GLFontGlyph*> m_glyphsValues;
|
|
- HashNamespace::hash_map<const char*, GLFontGlyph*, HashNamespace::hash<const char*>, hashcmp_str> m_glyphs;
|
|
+ HashNamespace::hash_map<std::string, GLFontGlyph*> m_glyphs;
|
|
|
|
std::vector<std::string> m_glyphsLettersKeys;
|
|
std::vector<GLFontGlyphLetter*> m_glyphsLettersValues;
|
|
- HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str> m_glyphsLetters;
|
|
+ HashNamespace::hash_map<std::string, GLFontGlyphLetter*> m_glyphsLetters;
|
|
|
|
unsigned int getLonguestLineSize(const std::string& i_value, unsigned int i_start = 0, unsigned int i_nbLinesToRead = -1);
|
|
};
|
|
@@ -825,7 +825,7 @@ GLFontGlyph::GLFontGlyph(const std::stri
|
|
}
|
|
|
|
GLFontGlyph::GLFontGlyph(const std::string& i_value,
|
|
- HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str>& i_glyphsLetters) {
|
|
+ HashNamespace::hash_map<std::string, GLFontGlyphLetter*>& i_glyphsLetters) {
|
|
GLFontGlyph* v_glyph;
|
|
std::string v_char;
|
|
|