From 327e99adcbc1430682d59dfc50c74088f6ae29e8 Mon Sep 17 00:00:00 2001 From: Kaloian Manassiev Date: Mon, 27 Jul 2015 14:40:16 -0400 Subject: SERVER-18084 Cleanup includes --- src/mongo/db/ops/update_lifecycle_impl.cpp | 3 +-- src/mongo/db/ops/update_lifecycle_impl.h | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mongo/db/ops') diff --git a/src/mongo/db/ops/update_lifecycle_impl.cpp b/src/mongo/db/ops/update_lifecycle_impl.cpp index ff8d76bc71d..511f1b59244 100644 --- a/src/mongo/db/ops/update_lifecycle_impl.cpp +++ b/src/mongo/db/ops/update_lifecycle_impl.cpp @@ -36,7 +36,6 @@ #include "mongo/db/catalog/collection.h" #include "mongo/db/s/collection_metadata.h" #include "mongo/db/s/sharding_state.h" -#include "mongo/s/chunk_version.h" namespace mongo { @@ -74,7 +73,7 @@ const UpdateIndexData* UpdateLifecycleImpl::getIndexKeys(OperationContext* opCtx } const std::vector* UpdateLifecycleImpl::getImmutableFields() const { - CollectionMetadataPtr metadata = getMetadata(_nsString); + std::shared_ptr metadata = getMetadata(_nsString); if (metadata) { const std::vector& fields = metadata->getKeyPatternFields(); // Return shard-keys as immutable for the update system. diff --git a/src/mongo/db/ops/update_lifecycle_impl.h b/src/mongo/db/ops/update_lifecycle_impl.h index d7e5616f4eb..da67a8f2f9d 100644 --- a/src/mongo/db/ops/update_lifecycle_impl.h +++ b/src/mongo/db/ops/update_lifecycle_impl.h @@ -58,9 +58,10 @@ public: virtual const std::vector* getImmutableFields() const; private: - Collection* _collection; const NamespaceString& _nsString; - ChunkVersion _shardVersion; + const ChunkVersion _shardVersion; + + Collection* _collection; }; } /* namespace mongo */ -- cgit v1.2.1