diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/MapI.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/Freeze/SharedDb.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/slice2freeze/Main.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp index 065a48c1fa0..6687121a274 100644 --- a/cpp/src/Freeze/MapI.cpp +++ b/cpp/src/Freeze/MapI.cpp @@ -139,8 +139,8 @@ Freeze::IteratorHelperI::IteratorHelperI(const MapHelperI& m, bool readOnly, _map(m), _dbc(0), _indexed(index != 0), - _tx(0), - _onlyDups(onlyDups) + _onlyDups(onlyDups), + _tx(0) { if(_map._trace >= 2) { @@ -189,8 +189,8 @@ Freeze::IteratorHelperI::IteratorHelperI(const IteratorHelperI& it) : _map(it._map), _dbc(0), _indexed(it._indexed), - _tx(0), - _onlyDups(it._onlyDups) + _onlyDups(it._onlyDups), + _tx(0) { if(_map._trace >= 2) { diff --git a/cpp/src/Freeze/SharedDb.cpp b/cpp/src/Freeze/SharedDb.cpp index 8cfd9feb1a3..511525c1306 100644 --- a/cpp/src/Freeze/SharedDb.cpp +++ b/cpp/src/Freeze/SharedDb.cpp @@ -242,9 +242,9 @@ Freeze::SharedDb::SharedDb(const MapKey& mapKey, bool createDb) : Db(connection->dbEnv()->getEnv(), 0), _mapKey(mapKey), - _keyCompare(keyCompare), _refCount(0), - _trace(connection->trace()) + _trace(connection->trace()), + _keyCompare(keyCompare) { if(_trace >= 1) { diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index 6900e89d959..16973369a8b 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -157,7 +157,7 @@ getCompare(const T& t, const string& keyType) { if(t.userCompare == "") { - return "std::less<" + keyType + ">"; + return "std::less< " + keyType + ">"; } else { @@ -271,7 +271,7 @@ writeDictWithIndicesH(const string& name, const Dict& dict, { string compare = getCompare(dict, typeToString(keyType)); - string templateParams = string("<") + typeToString(keyType) + ", " + string templateParams = string("< ") + typeToString(keyType) + ", " + typeToString(valueType) + ", " + name + "KeyCodec, " + name + "ValueCodec, " + compare + " >"; @@ -449,7 +449,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di { string compare = getCompare(dict, typeToString(keyType)); - string templateParams = string("<") + typeToString(keyType) + ", " + string templateParams = string("< ") + typeToString(keyType) + ", " + typeToString(valueType) + ", " + name + "KeyCodec, " + name + "ValueCodec, " + compare + " >"; |