Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/decoder/PayloadDecoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -230,6 +236,9 @@ namespace clienttelemetry {
}
}
}
#ifdef _MSC_VER
#pragma warning( pop )
#endif // _MSC_VER

void to_json(json& j, const Record& r)
{
Expand Down
9 changes: 9 additions & 0 deletions lib/system/JsonFormatter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -126,6 +132,9 @@ namespace MAT_NS_BEGIN
}
}
}
#ifdef _MSC_VER
#pragma warning( pop )
#endif // _MSC_VER

std::string JsonFormatter::getJsonFormattedEvent(IncomingEventContextPtr const& event)
{
Expand Down
Loading