Skip to content

Commit d1e8284

Browse files
ThomsonTanThomsonTan
authored
Merge branch 'main' into bump-macos-12-14
2 parents 72bf84a + cf69613 commit d1e8284

File tree

16 files changed

+24827
-22
lines changed

16 files changed

+24827
-22
lines changed

‎CMakeLists.txt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ if(APPLE)
8282

8383
if(FORCE_RESET_OSX_DEPLOYMENT_TARGET)
8484
set(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)
85-
if((${IOS_PLAT} STREQUAL "iphonesimulator") AND ((${IOS_ARCH} STREQUAL "arm64") OR (${IOS_ARCH} STREQUAL "arm64e")))
86-
# iOS arm64 simulator is supported starting BigSur
87-
# Unfortunately, CMAKE produces a device binary (not simulator) when providing -miphoneos-version-min flag when building iOS arm64 simulator
85+
if (${IOS_PLAT} STREQUAL "iphonesimulator")
86+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mios-simulator-version-min=${IOS_DEPLOYMENT_TARGET}")
87+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mios-simulator-version-min=${IOS_DEPLOYMENT_TARGET}")
8888
else()
8989
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -miphoneos-version-min=${IOS_DEPLOYMENT_TARGET}")
9090
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -miphoneos-version-min=${IOS_DEPLOYMENT_TARGET}")
@@ -346,6 +346,9 @@ include_directories(lib/pal)
346346
# add_subdirectory(bondlite/tests)
347347
#endif()
348348

349+
# Include repo root to allow includes of sqlite, zlib, and nlohmann
350+
include_directories(${CMAKE_SOURCE_DIR})
351+
349352
if(BUILD_HEADERS)
350353
add_subdirectory(lib/include)
351354
endif()

‎Solutions/Clienttelemetry/Clienttelemetry.vcxitems‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99
<ItemDefinitionGroup>
1010
<ClCompile>
11-
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
11+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\..</AdditionalIncludeDirectories>
1212
</ClCompile>
1313
</ItemDefinitionGroup>
1414
<ItemGroup>
@@ -115,7 +115,6 @@
115115
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\INetworkInformation.hpp" />
116116
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IPropertyChangedCallback.hpp" />
117117
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\ISystemInformation.hpp" />
118-
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\json.hpp" />
119118
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\oacr.h" />
120119
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\TransmitProfiles.hpp" />
121120
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CommonFields.h" />
@@ -201,6 +200,7 @@
201200
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\StringUtils.hpp" />
202201
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\ZlibUtils.hpp" />
203202
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\Utils.hpp" />
203+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\nlohmann\json.hpp" />
204204
</ItemGroup>
205205
<ItemGroup>
206206
<None Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp.template" />

‎Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\INetworkInformation.hpp" />
101101
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IPropertyChangedCallback.hpp" />
102102
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\ISystemInformation.hpp" />
103-
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\json.hpp" />
104103
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\oacr.h" />
105104
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\TransmitProfiles.hpp" />
106105
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CommonFields.h" />
@@ -189,6 +188,7 @@
189188
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\StringUtils.hpp" />
190189
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\ZlibUtils.hpp" />
191190
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\Utils.hpp" />
191+
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\nlohmann\json.hpp" />
192192
</ItemGroup>
193193
<ItemGroup>
194194
<None Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp.template" />

‎lib/android_build/app/src/main/cpp/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ include_directories(AFTER
1919
${SDK_ROOT}/lib/include/mat
2020
${SDK_ROOT}/sqlite
2121
${SDK_ROOT}lib/pal
22+
${SDK_ROOT}
2223
"${gmock_dir}/include"
2324
"${gmock_dir}"
2425
"${gtest_dir}/include"

‎lib/android_build/maesdk/src/main/cpp/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ target_include_directories(${TARGETNAME} PUBLIC
142142
${SDK_ROOT}/lib/include/mat
143143
${SDK_ROOT}/sqlite
144144
${SDK_ROOT}lib/pal
145+
${SDK_ROOT}
145146
${CURL_INCLUDE_DIRS})
146147

147148

‎lib/api/LogConfiguration.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "LogConfiguration.hpp"
77

88
#ifdef HAVE_MAT_JSONHPP
9-
#include <json.hpp>
9+
#include <nlohmann/json.hpp>
1010
using json = nlohmann::json;
1111
#endif
1212

‎lib/decoder/PayloadDecoder.cpp‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ MAT_NS_END
4444
#endif
4545

4646
/* PayloadDecoder functionality requires json.hpp library */
47-
#include "json.hpp"
47+
#include <nlohmann/json.hpp>
4848

4949
/* Bond definition of CsProtocol::Record is auto-generated and could be different for each SDK version */
5050
#include "bond/All.hpp"
@@ -130,6 +130,12 @@ namespace clienttelemetry {
130130
return true;
131131
}
132132

133+
#ifdef _MSC_VER
134+
#pragma warning(push)
135+
#pragma warning(disable : 4866)
136+
// In C++17 left-to-right evaluation order for operands of operator[] is not guaranteed when the argument's copy constructor is run.
137+
// Evalutation order isn't not relied upon here, disabling warning.
138+
#endif // _MSC_VER
133139
void to_json(json& j, const Data& d)
134140
{
135141
for (const auto &kv : d.properties)
@@ -230,6 +236,9 @@ namespace clienttelemetry {
230236
}
231237
}
232238
}
239+
#ifdef _MSC_VER
240+
#pragma warning( pop )
241+
#endif // _MSC_VER
233242

234243
void to_json(json& j, const Record& r)
235244
{

‎lib/http/HttpResponseDecoder.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <cassert>
1212

1313
#ifdef HAVE_MAT_JSONHPP
14-
#include "json.hpp"
14+
#include <nlohmann/json.hpp>
1515
#endif
1616

1717
namespace MAT_NS_BEGIN {

‎lib/include/public/Version.hpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#define MAT_VERSION_HPP
77
// WARNING: DO NOT MODIFY THIS FILE!
88
// This file has been automatically generated, manual changes will be lost.
9-
#define BUILD_VERSION_STR "3.8.249.1"
10-
#define BUILD_VERSION 3,8,249,1
9+
#define BUILD_VERSION_STR "3.9.22.1"
10+
#define BUILD_VERSION 3,9,22,1
1111

1212
#ifndef RESOURCE_COMPILER_INVOKED
1313
#include "ctmacros.hpp"
@@ -17,8 +17,8 @@ namespace MAT_NS_BEGIN {
1717

1818
uint64_t const Version =
1919
((uint64_t)3 << 48) |
20-
((uint64_t)8 << 32) |
21-
((uint64_t)249 << 16) |
20+
((uint64_t)9 << 32) |
21+
((uint64_t)22 << 16) |
2222
((uint64_t)1);
2323

2424
} MAT_NS_END
@@ -27,4 +27,3 @@ namespace PAL_NS_BEGIN { } PAL_NS_END
2727

2828
#endif // RESOURCE_COMPILER_INVOKED
2929
#endif
30-

‎lib/system/JsonFormatter.cpp‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
#include "JsonFormatter.hpp"
66
#include "CorrelationVector.hpp"
7-
#include "json.hpp"
7+
#include <nlohmann/json.hpp>
88

99
using json = nlohmann::json;
1010

@@ -40,6 +40,12 @@ namespace MAT_NS_BEGIN
4040
}
4141
}
4242

43+
#ifdef _MSC_VER
44+
#pragma warning( push )
45+
#pragma warning( disable : 4866 )
46+
// In C++17 left-to-right evaluation order for operands of operator[] is not guaranteed when the argument's copy constructor is run.
47+
// Evalutation order isn't not relied upon here, disabling warning.
48+
#endif // _MSC_VER
4349
void addData(json& object, std::vector<::CsProtocol::Data>& data)
4450
{
4551
std::vector<::CsProtocol::Data>::const_iterator it;
@@ -126,6 +132,9 @@ namespace MAT_NS_BEGIN
126132
}
127133
}
128134
}
135+
#ifdef _MSC_VER
136+
#pragma warning( pop )
137+
#endif // _MSC_VER
129138

130139
std::string JsonFormatter::getJsonFormattedEvent(IncomingEventContextPtr const& event)
131140
{

0 commit comments

Comments
 (0)