diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2016-01-11 15:58:18 -0500 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2016-01-12 16:46:44 -0500 |
commit | a1313488c04d5f532044506c78f728bd9f742e7d (patch) | |
tree | eb919f1a30214292b1f1bd3f62a30327e271c092 /src/mongo/s/config.cpp | |
parent | c298fa69111ec33912c9f2294de8fe8f7703ab35 (diff) | |
download | mongo-a1313488c04d5f532044506c78f728bd9f742e7d.tar.gz |
SERVER-22112 Remove circular dependency between CatalogManager and CatalogCache
Diffstat (limited to 'src/mongo/s/config.cpp')
-rw-r--r-- | src/mongo/s/config.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/s/config.cpp b/src/mongo/s/config.cpp index f8b2076b96d..e051bfd5253 100644 --- a/src/mongo/s/config.cpp +++ b/src/mongo/s/config.cpp @@ -100,7 +100,7 @@ void CollectionInfo::unshard() { _key = BSONObj(); } -void CollectionInfo::useChunkManager(ChunkManagerPtr manager) { +void CollectionInfo::useChunkManager(std::shared_ptr<ChunkManager> manager) { _cm = manager; _key = manager->getShardKeyPattern().toBSON().getOwned(); _unique = manager->isUnique(); @@ -253,10 +253,10 @@ void DBConfig::getChunkManagerOrPrimary(OperationContext* txn, } -ChunkManagerPtr DBConfig::getChunkManagerIfExists(OperationContext* txn, - const string& ns, - bool shouldReload, - bool forceReload) { +std::shared_ptr<ChunkManager> DBConfig::getChunkManagerIfExists(OperationContext* txn, + const string& ns, + bool shouldReload, + bool forceReload) { // Don't report exceptions here as errors in GetLastError LastError::Disabled ignoreForGLE(&LastError::get(cc())); |