diff options
| author | Dan Pasette <dan@10gen.com> | 2013-01-22 18:31:46 -0500 |
|---|---|---|
| committer | Dan Pasette <dan@10gen.com> | 2013-01-22 18:31:46 -0500 |
| commit | 0adb9623539b7cf8bc9bb32bb61b9b83db9c0fda (patch) | |
| tree | 0c470c26df3ccbfcc8b0767ac95115197f4f7535 | |
| parent | 0bab4de51001b8e60eff262ac5c3e860908f25f0 (diff) | |
| download | mongo-0adb9623539b7cf8bc9bb32bb61b9b83db9c0fda.tar.gz | |
SERVER-8132: removed unordered_* and re-ordered imports in hostandport.h
to enable backport to 2.2.
| -rw-r--r-- | src/mongo/s/writeback_listener.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/s/writeback_listener.h | 6 | ||||
| -rw-r--r-- | src/mongo/util/net/hostandport.h | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/mongo/s/writeback_listener.cpp b/src/mongo/s/writeback_listener.cpp index 3dd95b0f73c..108a29567e3 100644 --- a/src/mongo/s/writeback_listener.cpp +++ b/src/mongo/s/writeback_listener.cpp @@ -32,8 +32,8 @@ namespace mongo { - unordered_map<string,WriteBackListener*> WriteBackListener::_cache; - unordered_set<string> WriteBackListener::_seenSets; + map<string,WriteBackListener*> WriteBackListener::_cache; + set<string> WriteBackListener::_seenSets; mongo::mutex WriteBackListener::_cacheLock("WriteBackListener"); map<WriteBackListener::ConnectionIdent,WriteBackListener::WBStatus> WriteBackListener::_seenWritebacks; diff --git a/src/mongo/s/writeback_listener.h b/src/mongo/s/writeback_listener.h index 15f041a2cf5..5d1d42d28aa 100644 --- a/src/mongo/s/writeback_listener.h +++ b/src/mongo/s/writeback_listener.h @@ -20,8 +20,6 @@ #include "mongo/pch.h" -#include "mongo/platform/unordered_map.h" -#include "mongo/platform/unordered_set.h" #include "../client/connpool.h" #include "../util/background.h" #include "../db/client.h" @@ -74,8 +72,8 @@ namespace mongo { string _name; static mongo::mutex _cacheLock; // protects _cache - static unordered_map<string,WriteBackListener*> _cache; // server to listener - static unordered_set<string> _seenSets; // cache of set urls we've seen - note this is ever expanding for order, case, changes + static map<string,WriteBackListener*> _cache; // server to listener + static set<string> _seenSets; // cache of set urls we've seen - note this is ever expanding for order, case, changes struct WBStatus { OID id; diff --git a/src/mongo/util/net/hostandport.h b/src/mongo/util/net/hostandport.h index 5b734428f46..b4aacd39bd1 100644 --- a/src/mongo/util/net/hostandport.h +++ b/src/mongo/util/net/hostandport.h @@ -17,10 +17,10 @@ #pragma once -#include "mongo/bson/util/builder.h" #include "mongo/db/cmdline.h" #include "mongo/util/mongoutils/str.h" #include "mongo/util/net/sock.h" +#include "mongo/bson/util/builder.h" namespace mongo { |