SERVER-59233 Address stringop and array bounds warnings with GCC 11

1 files changed, 9 insertions, 8 deletions

diff --git a/src/mongo/db/dbmessage.h b/src/mongo/db/dbmessage.h
index 41168cce628..3beb85991b3 100644
--- a/src/mongo/db/dbmessage.h
+++ b/src/mongo/db/dbmessage.h
@@ -100,6 +100,7 @@ namespace QueryResult {
  */
 struct Layout {
     MsgData::Layout msgdata;
+    int32_t resultFlags;
     int64_t cursorId;
     int32_t startingFrom;
     int32_t nReturned;
@@ -118,6 +119,10 @@ public:
         return storage().view(offsetof(Layout, msgdata));
     }
 
+    int32_t getResultFlags() const {
+        return storage().read<LittleEndian<int32_t>>(offsetof(Layout, resultFlags));
+    }
+
     int64_t getCursorId() const {
         return storage().read<LittleEndian<int64_t>>(offsetof(Layout, cursorId));
     }
@@ -161,6 +166,10 @@ public:
         return storage().view(offsetof(Layout, msgdata));
     }
 
+    void setResultFlags(int32_t value) {
+        storage().write(tagLittleEndian(value), offsetof(Layout, resultFlags));
+    }
+
     void setCursorId(int64_t value) {
         storage().write(tagLittleEndian(value), offsetof(Layout, cursorId));
     }
@@ -173,14 +182,6 @@ public:
         storage().write(tagLittleEndian(value), offsetof(Layout, nReturned));
     }
 
-    int32_t getResultFlags() {
-        return DataView(msgdata().data()).read<LittleEndian<int32_t>>();
-    }
-
-    void setResultFlags(int32_t value) {
-        DataView(msgdata().data()).write(tagLittleEndian(value));
-    }
-
     void setResultFlagsToOk() {
         setResultFlags(ResultFlag_AwaitCapable);
     }