SERVER-33679 Forward declare OperationContext in read_concern_args.h

2 files changed, 14 insertions, 3 deletions

diff --git a/src/mongo/db/repl/read_concern_args.cpp b/src/mongo/db/repl/read_concern_args.cpp
index cda493dd1c7..cc56cba84e8 100644
--- a/src/mongo/db/repl/read_concern_args.cpp
+++ b/src/mongo/db/repl/read_concern_args.cpp
@@ -35,6 +35,7 @@
 #include "mongo/bson/util/bson_extract.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/logical_time.h"
+#include "mongo/db/operation_context.h"
 #include "mongo/db/repl/bson_extract_optime.h"
 #include "mongo/util/mongoutils/str.h"
 
@@ -60,9 +61,18 @@ const string ReadConcernArgs::kAtClusterTimeFieldName("atClusterTime");
 
 const string ReadConcernArgs::kLevelFieldName("level");
 
-const OperationContext::Decoration<ReadConcernArgs> ReadConcernArgs::get =
+const OperationContext::Decoration<ReadConcernArgs> handle =
     OperationContext::declareDecoration<ReadConcernArgs>();
 
+ReadConcernArgs& ReadConcernArgs::get(OperationContext* opCtx) {
+    return handle(opCtx);
+}
+
+const ReadConcernArgs& ReadConcernArgs::get(const OperationContext* opCtx) {
+    return handle(opCtx);
+}
+
+
 ReadConcernArgs::ReadConcernArgs() = default;
 
 ReadConcernArgs::ReadConcernArgs(boost::optional<ReadConcernLevel> level)
diff --git a/src/mongo/db/repl/read_concern_args.h b/src/mongo/db/repl/read_concern_args.h
index 097b05858a9..6ec753d2ac5 100644
--- a/src/mongo/db/repl/read_concern_args.h
+++ b/src/mongo/db/repl/read_concern_args.h
@@ -34,7 +34,6 @@
 #include "mongo/base/status.h"
 #include "mongo/db/json.h"
 #include "mongo/db/logical_time.h"
-#include "mongo/db/operation_context.h"
 #include "mongo/db/repl/optime.h"
 #include "mongo/db/repl/read_concern_level.h"
 #include "mongo/util/time_support.h"
@@ -42,6 +41,7 @@
 namespace mongo {
 
 class BSONObj;
+class OperationContext;
 
 namespace repl {
 
@@ -53,7 +53,8 @@ public:
     static const std::string kAtClusterTimeFieldName;
     static const std::string kLevelFieldName;
 
-    static const OperationContext::Decoration<ReadConcernArgs> get;
+    static ReadConcernArgs& get(OperationContext* opCtx);
+    static const ReadConcernArgs& get(const OperationContext* opCtx);
 
     ReadConcernArgs();