81 lines
2.4 KiB
Diff
81 lines
2.4 KiB
Diff
--- common/string.hpp
|
|
+++ common/string.hpp
|
|
@@ -492,7 +492,7 @@
|
|
|
|
namespace std
|
|
{
|
|
- template<> static inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
|
|
+ template<> inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
|
|
}
|
|
|
|
#endif
|
|
--- common/string_map.cpp
|
|
+++ common/string_map.cpp
|
|
@@ -37,7 +37,12 @@
|
|
i->second = buffer_.dup(i->second);
|
|
}
|
|
}
|
|
-
|
|
+
|
|
+ // this requires hash-t.hpp
|
|
+ PosibErr<bool> StringMap::remove(ParmStr key)
|
|
+ {
|
|
+ return lookup_.erase(key);
|
|
+ }
|
|
|
|
class StringMapEnumeration : public StringPairEnumeration {
|
|
StringMap::CIter_ i;
|
|
--- common/string_map.hpp
|
|
+++ common/string_map.hpp
|
|
@@ -96,7 +96,7 @@
|
|
}
|
|
|
|
// removes an element. Returns true if the element existed.
|
|
- PosibErr<bool> remove(ParmStr key) {return lookup_.erase(key);}
|
|
+ PosibErr<bool> remove(ParmStr key);
|
|
|
|
// looks up an element. Returns null if the element did not exist.
|
|
// returns an empty string if the element exists but has a null value
|
|
--- modules/speller/default/affix.cpp
|
|
+++ modules/speller/default/affix.cpp
|
|
@@ -193,7 +193,7 @@
|
|
typedef const Conds * Value;
|
|
typedef const char * Key;
|
|
static const bool is_multi = false;
|
|
- hash<const char *> hfun;
|
|
+ acommon::hash<const char *> hfun;
|
|
size_t hash(const char * s) {return hfun(s);}
|
|
bool equal(const char * x, const char * y) {return strcmp(x,y) == 0;}
|
|
const char * key(const Conds * c) {return c->str;}
|
|
--- modules/speller/default/readonly_ws.cpp
|
|
+++ modules/speller/default/readonly_ws.cpp
|
|
@@ -726,7 +726,7 @@
|
|
struct WordLookupParms {
|
|
const char * block_begin;
|
|
WordLookupParms() {}
|
|
- typedef Vector<u32int> Vector;
|
|
+ typedef acommon::Vector<u32int> Vector;
|
|
typedef u32int Value;
|
|
typedef const char * Key;
|
|
static const bool is_multi = false;
|
|
--- prog/aspell.cpp
|
|
+++ prog/aspell.cpp
|
|
@@ -1882,7 +1882,7 @@
|
|
typedef SML_WordEntry Value;
|
|
typedef const char * Key;
|
|
static const bool is_multi = false;
|
|
- hash<const char *> hash;
|
|
+ acommon::hash<const char *> hash;
|
|
bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
|
|
Key key(const Value & v) {return v.word;}
|
|
};
|
|
@@ -2033,7 +2033,7 @@
|
|
typedef CML_Entry Value;
|
|
typedef const char * Key;
|
|
static const bool is_multi = true;
|
|
- hash<const char *> hash;
|
|
+ acommon::hash<const char *> hash;
|
|
bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
|
|
Key key(const Value & v) {return v.word;}
|
|
};
|