Merge branch 'main' into user/asayem/1ds_reachability

microsoft · Feb 3, 2025 · 8c32fe3 · 8c32fe3
2 parents db0b8f6 + 715e5f9
commit 8c32fe3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/decoder/PayloadDecoder.cpp b/lib/decoder/PayloadDecoder.cpp
@@ -130,6 +130,12 @@ namespace clienttelemetry {
                 return true;
             }
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4866) 
+// In C++17 left-to-right evaluation order for operands of operator[] is not guaranteed when the argument's copy constructor is run.
+// Evalutation order isn't not relied upon here, disabling warning.
+#endif // _MSC_VER
             void to_json(json& j, const Data& d)
             {
                 for (const auto &kv : d.properties)
@@ -230,6 +236,9 @@ namespace clienttelemetry {
                     }
                 }
             }
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif  // _MSC_VER
 
             void to_json(json& j, const Record& r)
             {

diff --git a/lib/system/JsonFormatter.cpp b/lib/system/JsonFormatter.cpp
@@ -40,6 +40,12 @@ namespace MAT_NS_BEGIN
         }
     }
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable : 4866 )
+// In C++17 left-to-right evaluation order for operands of operator[] is not guaranteed when the argument's copy constructor is run.
+// Evalutation order isn't not relied upon here, disabling warning.
+#endif // _MSC_VER
     void addData(json& object, std::vector<::CsProtocol::Data>& data)
     {
         std::vector<::CsProtocol::Data>::const_iterator it;
@@ -126,6 +132,9 @@ namespace MAT_NS_BEGIN
             }
         }
     }
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif  // _MSC_VER
 
     std::string JsonFormatter::getJsonFormattedEvent(IncomingEventContextPtr const& event)
     {