From ee2dd703630330bdb51b6cfcbae6b29c0c92cb4f Mon Sep 17 00:00:00 2001 From: Max Golovanov Date: Thu, 13 Aug 2020 22:30:45 -0700 Subject: [PATCH] OSS clean-up: - rename ARIA SDK to MAT / 1DS - add MIT license to public headers --- Solutions/net40/dllmain.cpp | 4 +-- azure-pipelines.yml | 2 +- docs/PAL.md | 2 +- docs/cpp-start-macosx.md | 2 +- docs/cppDoxygenConfig | 7 ++--- examples/c/SampleC-Guest/CMakeLists.txt | 2 +- examples/c/SampleC-Guest/demo.c | 4 +-- examples/cpp/EventSender/CMakeLists.txt | 2 +- examples/cpp/MacProxy/CMakeLists.txt | 2 +- examples/cpp/SampleCpp/CMakeLists.txt | 2 +- examples/cpp/SampleCpp/LogManagerA.hpp | 4 +-- examples/cpp/SampleCpp/LogManagerB.hpp | 4 +-- .../cpp/SampleCppLogManagers/LogManagerA.hpp | 4 +-- .../cpp/SampleCppLogManagers/LogManagerB.hpp | 4 +-- examples/cpp/SampleCppLogManagers/main.cpp | 4 +-- examples/cpp/SampleCppMini/CMakeLists.txt | 2 +- examples/objc/cocoa-app/CMakeLists.txt | 2 +- lib/CMakeLists.txt | 2 +- lib/api/AllowedLevelsCollection.cpp | 4 +-- lib/api/AllowedLevelsCollection.hpp | 4 +-- lib/api/AuthTokensController.cpp | 4 +-- lib/api/AuthTokensController.hpp | 4 +-- lib/api/ContextFieldsProvider.cpp | 4 +-- lib/api/ContextFieldsProvider.hpp | 4 +-- lib/api/CorrelationVector.cpp | 4 +-- lib/api/DataViewerCollection.cpp | 4 +-- lib/api/DataViewerCollection.hpp | 4 +-- lib/api/ILogConfiguration.cpp | 4 +-- lib/api/IRuntimeConfig.hpp | 4 +-- lib/api/LogConfiguration.cpp | 4 +-- lib/api/LogManager.cpp | 4 +-- lib/api/LogManagerFactory.cpp | 4 +-- lib/api/LogManagerFactory.hpp | 4 +-- lib/api/LogManagerImpl.cpp | 4 +-- lib/api/LogManagerImpl.hpp | 4 +-- lib/api/LogManagerProvider.cpp | 4 +-- lib/api/LogSessionData.cpp | 4 +-- lib/api/Logger.cpp | 4 +-- lib/api/Logger.hpp | 4 +-- lib/backoff/Backoff_ExponentialWithJitter.hpp | 4 +-- lib/backoff/IBackoff.cpp | 4 +-- lib/backoff/IBackoff.hpp | 4 +-- lib/bond/BondSerializer.cpp | 4 +-- lib/bond/BondSerializer.hpp | 4 +-- .../BandwidthController_ResourceManager.cpp | 4 +-- .../BandwidthController_ResourceManager.hpp | 4 +-- lib/callbacks/DebugSource.cpp | 4 +-- lib/compression/HttpDeflateCompression.cpp | 4 +-- lib/compression/HttpDeflateCompression.hpp | 4 +-- lib/config/RuntimeConfig_Default.hpp | 4 +-- lib/decoder/PayloadDecoder.cpp | 4 +-- lib/decorators/BaseDecorator.cpp | 4 +-- lib/decorators/BaseDecorator.hpp | 4 +-- lib/decorators/EventPropertiesDecorator.hpp | 4 +-- lib/decorators/SemanticApiDecorators.hpp | 4 +-- lib/decorators/SemanticContextDecorator.hpp | 4 +-- lib/filter/EventFilterCollection.cpp | 4 +-- lib/filter/EventFilterCollection.hpp | 4 +-- lib/http/HttpClientFactory.cpp | 4 +-- lib/http/HttpClientFactory.hpp | 4 +-- lib/http/HttpClientManager.cpp | 4 +-- lib/http/HttpClientManager.hpp | 4 +-- lib/http/HttpClient_Android.cpp | 4 +-- lib/http/HttpClient_Android.hpp | 4 +-- lib/http/HttpClient_Apple.hpp | 4 +-- lib/http/HttpClient_Apple.mm | 4 +-- lib/http/HttpClient_CAPI.cpp | 4 +-- lib/http/HttpClient_CAPI.hpp | 4 +-- lib/http/HttpClient_Curl.cpp | 4 +-- lib/http/HttpClient_Curl.hpp | 4 +-- lib/http/HttpClient_WinInet.cpp | 4 +-- lib/http/HttpClient_WinInet.hpp | 4 +-- lib/http/HttpClient_WinRt.cpp | 4 +-- lib/http/HttpClient_WinRt.hpp | 4 +-- lib/http/HttpRequestEncoder.cpp | 4 +-- lib/http/HttpRequestEncoder.hpp | 4 +-- lib/http/HttpResponseDecoder.cpp | 4 +-- lib/http/HttpResponseDecoder.hpp | 4 +-- lib/include/mat/IBandwidthController.hpp | 4 +-- lib/include/mat/IOfflineStorage.hpp | 4 +-- lib/include/public/AggregatedMetric.hpp | 20 +++++++++++-- lib/include/public/CAPIClient.hpp | 20 +++++++++++-- lib/include/public/CommonFields.h | 16 ++++++++++- .../public/CompliantByDefaultFilterApi.hpp | 19 +++++++++++-- lib/include/public/CorrelationVector.hpp | 20 +++++++++++-- lib/include/public/CsProtocol_types.hpp | 15 ++++++++++ lib/include/public/DebugEvents.hpp | 20 +++++++++++-- lib/include/public/Enums.hpp | 20 +++++++++++-- lib/include/public/EventProperties.hpp | 20 +++++++++++-- lib/include/public/EventProperty.hpp | 20 +++++++++++-- lib/include/public/IAFDClient.hpp | 16 ++++++++++- lib/include/public/IAuthTokensController.hpp | 20 +++++++++++-- lib/include/public/IBandwidthController.hpp | 20 +++++++++++-- lib/include/public/IDataViewer.hpp | 20 +++++++++++-- lib/include/public/IDataViewerCollection.hpp | 20 +++++++++++-- lib/include/public/IDecorator.hpp | 20 +++++++++++-- lib/include/public/IECSClient.hpp | 16 ++++++++++- lib/include/public/IEventFilter.hpp | 20 +++++++++++-- lib/include/public/IEventFilterCollection.hpp | 20 +++++++++++-- lib/include/public/IHttpClient.hpp | 20 +++++++++++-- lib/include/public/ILogConfiguration.hpp | 20 +++++++++++-- lib/include/public/ILogManager.hpp | 20 +++++++++++-- lib/include/public/ILogger.hpp | 20 +++++++++++-- lib/include/public/IModule.hpp | 20 +++++++++++-- lib/include/public/ISemanticContext.hpp | 20 +++++++++++-- lib/include/public/ITaskDispatcher.hpp | 20 +++++++++++-- lib/include/public/LogConfiguration.hpp | 20 +++++++++++-- lib/include/public/LogManager.hpp | 22 ++++++++++++--- lib/include/public/LogManagerBase.hpp | 20 +++++++++++-- lib/include/public/LogManagerProvider.hpp | 20 +++++++++++-- lib/include/public/LogSessionData.hpp | 20 +++++++++++-- lib/include/public/NullObjects.hpp | 20 +++++++++++-- lib/include/public/PayloadDecoder.hpp | 20 +++++++++++-- lib/include/public/TransmitProfiles.hpp | 20 +++++++++++-- lib/include/public/Variant.hpp | 20 +++++++++++-- lib/include/public/VariantType.hpp | 16 ++++++++++- lib/include/public/Version.hpp | 28 ++++++++++++++----- lib/include/public/Version.hpp.template | 28 ++++++++++++++----- lib/include/public/ctmacros.hpp | 16 ++++++++++- lib/include/public/mat.h | 16 ++++++++++- lib/jni/JniConvertors.cpp | 4 +-- lib/jni/JniConvertors.hpp | 4 +-- lib/jni/WrapperLogManager.hpp | 4 +-- lib/offline/ClockSkewManager.hpp | 4 +-- lib/offline/ISqlite3Proxy.hpp | 4 +-- lib/offline/KillSwitchManager.hpp | 4 +-- lib/offline/MemoryStorage.cpp | 4 +-- lib/offline/MemoryStorage.hpp | 4 +-- lib/offline/OfflineStorageHandler.cpp | 4 +-- lib/offline/OfflineStorageHandler.hpp | 4 +-- lib/offline/OfflineStorage_Room.cpp | 4 +-- lib/offline/OfflineStorage_Room.hpp | 4 +-- lib/offline/OfflineStorage_SQLite.cpp | 4 +-- lib/offline/OfflineStorage_SQLite.hpp | 4 +-- lib/offline/SQLiteWrapper.hpp | 4 +-- lib/offline/StorageObserver.cpp | 4 +-- lib/offline/StorageObserver.hpp | 4 +-- lib/packager/BondSplicer.cpp | 4 +-- lib/packager/BondSplicer.hpp | 4 +-- lib/packager/DataPackage.hpp | 4 +-- lib/packager/Packager.cpp | 4 +-- lib/packager/Packager.hpp | 4 +-- lib/pal/PAL.hpp | 4 +-- lib/pal/desktop/NetworkDetector.cpp | 4 +-- lib/pal/desktop/NetworkDetector.hpp | 4 +-- lib/pal/desktop/WindowsEnvironmentInfo.hpp | 4 +-- lib/shared/LogManagerCX.cpp | 2 +- lib/shared/PlatformHelpers.h | 4 +-- lib/stats/MetaStats.cpp | 4 +-- lib/stats/MetaStats.hpp | 4 +-- lib/stats/Statistics.cpp | 4 +-- lib/stats/Statistics.hpp | 4 +-- lib/system/ClockSkewDelta.h | 4 +-- lib/system/Contexts.hpp | 4 +-- lib/system/EventProperties.cpp | 5 ++-- lib/system/EventPropertiesStorage.hpp | 4 +-- lib/system/EventProperty.cpp | 4 +-- lib/system/ITelemetrySystem.hpp | 4 +-- lib/system/JsonFormatter.cpp | 4 +-- lib/system/JsonFormatter.hpp | 11 ++------ lib/system/Route.hpp | 4 +-- lib/system/TelemetrySystem.cpp | 4 +-- lib/system/TelemetrySystem.hpp | 4 +-- lib/system/TelemetrySystemBase.hpp | 4 +-- lib/tpm/DeviceStateHandler.cpp | 4 +-- lib/tpm/DeviceStateHandler.hpp | 4 +-- lib/tpm/TransmissionPolicyManager.cpp | 4 +-- lib/tpm/TransmissionPolicyManager.hpp | 4 +-- lib/tpm/TransmitProfiles.cpp | 4 +-- lib/tpm/TransmitProfilesStub.hpp | 4 +-- lib/utils/FileUtils.cpp | 4 +-- lib/utils/FileUtils.hpp | 4 +-- lib/utils/StringConversion.cpp | 4 +-- lib/utils/StringConversion.hpp | 4 +-- lib/utils/StringMatcher.hpp | 4 +-- lib/utils/StringUtils.cpp | 4 +-- lib/utils/StringUtils.hpp | 4 +-- lib/utils/Utils.cpp | 8 +++--- lib/utils/Utils.hpp | 4 +-- tests/functests/BasicFuncTests.cpp | 4 +-- 180 files changed, 947 insertions(+), 394 deletions(-) diff --git a/Solutions/net40/dllmain.cpp b/Solutions/net40/dllmain.cpp index 2d24dfdb..7e65a8cf 100644 --- a/Solutions/net40/dllmain.cpp +++ b/Solutions/net40/dllmain.cpp @@ -23,8 +23,8 @@ HRESULT __stdcall DllCanUnloadNow(void) void LockInMemory() { #ifndef _WINRT_DLL - HMODULE ariaModule; - ::GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_PIN, L"ClientTelemetry.dll", &ariaModule); + HMODULE mstelModule; + ::GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_PIN, L"ClientTelemetry.dll", &mstelModule); #endif } diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 52f2eee1..da74d505 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,7 +1,7 @@ resources: - repo: self queue: - name: aria-sdk-cpp + name: mstel-sdk-cpp steps: - task: CmdLine@1 diff --git a/docs/PAL.md b/docs/PAL.md index 4f52a82e..57b82ff1 100644 --- a/docs/PAL.md +++ b/docs/PAL.md @@ -11,7 +11,7 @@ Platform Abstraction Layer #### Lifetime -- The whole ARIA client library must be initialized by the application +- The whole 1DS client library must be initialized by the application before the first call to any of its other API methods, and shut down after no more API calls can be performed. - The PAL has similar lifetime scope -- `PAL::initialize()` will be diff --git a/docs/cpp-start-macosx.md b/docs/cpp-start-macosx.md index fe79daa1..02ed8345 100644 --- a/docs/cpp-start-macosx.md +++ b/docs/cpp-start-macosx.md @@ -87,5 +87,5 @@ logging system by adding the following statements to your main() function. *You're done! You can now compile and run your app, and it will send a telemetry event.* - _**Note:** If you need a deeper look into how to use the 1DS C++ SDK there is a couple of folders with examples under Aria.SDK.Cpp/examples_ + _**Note:** If you need a deeper look into how to use the 1DS C++ SDK there is a couple of folders with examples under `examples`_ diff --git a/docs/cppDoxygenConfig b/docs/cppDoxygenConfig index 16d755f4..8203b493 100644 --- a/docs/cppDoxygenConfig +++ b/docs/cppDoxygenConfig @@ -2060,10 +2060,9 @@ INCLUDE_FILE_PATTERNS = # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. PREDEFINED = _WIN32 \ - ARIASDK_LIBABI= \ - ARIASDK_NS_BEGIN=Microsoft { namespace Applications { namespace Events \ - ARIASDK_NS_END=}} \ - ARIASDK_NS=Microsoft::Applications::Events \ + MATSDK_LIBABI= \ + MAT_NS_BEGIN=Microsoft { namespace Applications { namespace Events \ + MAT_NS_END=}} \ MAT=Microsoft::Applications::Events \ PAL_NS_BEGIN=Microsoft { namespace Applications { namespace Events { namespace PlatformAbstraction \ PAL_NS_END=}}} \ diff --git a/examples/c/SampleC-Guest/CMakeLists.txt b/examples/c/SampleC-Guest/CMakeLists.txt index 75906ae4..d5932af4 100644 --- a/examples/c/SampleC-Guest/CMakeLists.txt +++ b/examples/c/SampleC-Guest/CMakeLists.txt @@ -23,7 +23,7 @@ find_package (Threads) set(MATSDK_INCLUDE /usr/local/include/mat) -# Aria SDK to include dirs +# 1DS SDK to include dirs include_directories( . ${MATSDK_INCLUDE} ) # Link main.cpp to executable diff --git a/examples/c/SampleC-Guest/demo.c b/examples/c/SampleC-Guest/demo.c index 82b53078..864ffcfe 100644 --- a/examples/c/SampleC-Guest/demo.c +++ b/examples/c/SampleC-Guest/demo.c @@ -25,12 +25,12 @@ void test_c_api_guest() "\"maxTeardownUploadTimeInSec\":5," // Allow up to 5 seconds for upload "\"hostMode\":false," // Explicitly declare yourself as guest "\"minimumTraceLevel\":0," // Debug printout level - "\"sdkmode\":0" // Aria direct-upload mode + "\"sdkmode\":0" // 1DS direct-upload mode "}"; // Attemppt to load an alternate impl if available #ifdef _WIN32 - evt_load((evt_handle_t)LoadLibrary(L"MsoAriaNext.dll")); + evt_load((evt_handle_t)LoadLibrary(L"ClientTelemetry2.dll")); #endif evt_handle_t handle = evt_open(config); diff --git a/examples/cpp/EventSender/CMakeLists.txt b/examples/cpp/EventSender/CMakeLists.txt index b009ea19..67a1a3ae 100644 --- a/examples/cpp/EventSender/CMakeLists.txt +++ b/examples/cpp/EventSender/CMakeLists.txt @@ -23,7 +23,7 @@ find_package (Threads) set(MAT_SDK_INCLUDE /usr/local/include/mat) -# Aria SDK to include dirs +# 1DS SDK to include dirs include_directories( . ${MAT_SDK_INCLUDE} ) # Link main.cpp to executable diff --git a/examples/cpp/MacProxy/CMakeLists.txt b/examples/cpp/MacProxy/CMakeLists.txt index b00453a7..89d4cb23 100644 --- a/examples/cpp/MacProxy/CMakeLists.txt +++ b/examples/cpp/MacProxy/CMakeLists.txt @@ -23,7 +23,7 @@ find_package (Threads) set(MAT_SDK_INCLUDE /usr/local/include/mat) -# Aria SDK to include dirs +# 1DS SDK to include dirs include_directories( . ${MAT_SDK_INCLUDE} ) # Link main.cpp to executable diff --git a/examples/cpp/SampleCpp/CMakeLists.txt b/examples/cpp/SampleCpp/CMakeLists.txt index 46c1c401..c5e6bbb3 100644 --- a/examples/cpp/SampleCpp/CMakeLists.txt +++ b/examples/cpp/SampleCpp/CMakeLists.txt @@ -23,7 +23,7 @@ find_package (Threads) set(MAT_SDK_INCLUDE /usr/local/include/mat) -# Aria SDK to include dirs +# 1DS SDK to include dirs include_directories( . ${MAT_SDK_INCLUDE} ) # Link main.cpp to executable diff --git a/examples/cpp/SampleCpp/LogManagerA.hpp b/examples/cpp/SampleCpp/LogManagerA.hpp index 537a8ad8..1423c2f6 100644 --- a/examples/cpp/SampleCpp/LogManagerA.hpp +++ b/examples/cpp/SampleCpp/LogManagerA.hpp @@ -1,7 +1,7 @@ #pragma once #include "LogManager.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class ModuleA : public ILogConfiguration {}; class LogManagerA : public LogManagerBase {}; DEFINE_LOGMANAGER(LogManagerA, ModuleA); -} ARIASDK_NS_END +} MAT_NS_END diff --git a/examples/cpp/SampleCpp/LogManagerB.hpp b/examples/cpp/SampleCpp/LogManagerB.hpp index 27824bbf..e0bb98f2 100644 --- a/examples/cpp/SampleCpp/LogManagerB.hpp +++ b/examples/cpp/SampleCpp/LogManagerB.hpp @@ -1,7 +1,7 @@ #pragma once #include "LogManager.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class ModuleB : public ILogConfiguration {}; class LogManagerB : public LogManagerBase {}; DEFINE_LOGMANAGER(LogManagerB, ModuleB); -} ARIASDK_NS_END +} MAT_NS_END diff --git a/examples/cpp/SampleCppLogManagers/LogManagerA.hpp b/examples/cpp/SampleCppLogManagers/LogManagerA.hpp index ee5fed4b..1a9c361f 100644 --- a/examples/cpp/SampleCppLogManagers/LogManagerA.hpp +++ b/examples/cpp/SampleCppLogManagers/LogManagerA.hpp @@ -1,6 +1,6 @@ #pragma once #include "LogManager.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class ModuleA : public ILogConfiguration {}; class LogManagerA : public LogManagerBase {}; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/examples/cpp/SampleCppLogManagers/LogManagerB.hpp b/examples/cpp/SampleCppLogManagers/LogManagerB.hpp index fa5cfe3a..c4f9b076 100644 --- a/examples/cpp/SampleCppLogManagers/LogManagerB.hpp +++ b/examples/cpp/SampleCppLogManagers/LogManagerB.hpp @@ -1,6 +1,6 @@ #pragma once #include "LogManager.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class ModuleB : public ILogConfiguration {}; class LogManagerB : public LogManagerBase {}; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/examples/cpp/SampleCppLogManagers/main.cpp b/examples/cpp/SampleCppLogManagers/main.cpp index 76dcdf29..664a2411 100644 --- a/examples/cpp/SampleCppLogManagers/main.cpp +++ b/examples/cpp/SampleCppLogManagers/main.cpp @@ -10,10 +10,10 @@ using namespace MAT; // Define two instances for different LogManagers: A and B // This is how it's done with LOGMANAGER_INSTANCE macro to define the // default LogManager instance -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { DEFINE_LOGMANAGER(LogManagerB, ModuleB); DEFINE_LOGMANAGER(LogManagerA, ModuleA); -} ARIASDK_NS_END +} MAT_NS_END void twoModules_LogManagerTest() { diff --git a/examples/cpp/SampleCppMini/CMakeLists.txt b/examples/cpp/SampleCppMini/CMakeLists.txt index 5839e709..af0fbf87 100644 --- a/examples/cpp/SampleCppMini/CMakeLists.txt +++ b/examples/cpp/SampleCppMini/CMakeLists.txt @@ -23,7 +23,7 @@ find_package (Threads) set(MAT_SDK_INCLUDE /usr/local/include/aria) -# Aria SDK to include dirs +# 1DS SDK to include dirs include_directories( . ${MAT_SDK_INCLUDE} ) # Link main.cpp to executable diff --git a/examples/objc/cocoa-app/CMakeLists.txt b/examples/objc/cocoa-app/CMakeLists.txt index e8b6afc4..4d5456a8 100644 --- a/examples/objc/cocoa-app/CMakeLists.txt +++ b/examples/objc/cocoa-app/CMakeLists.txt @@ -17,7 +17,7 @@ find_package (Threads) set(MATSDK_INCLUDE /usr/local/include/mat) -# Aria SDK to include dirs +# 1DS SDK to include dirs include_directories( . ${MATSDK_INCLUDE} ) # Prefer linking to more recent local sqlite3 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 66f3fd7a..276198c7 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -138,7 +138,7 @@ elseif(PAL_IMPLEMENTATION STREQUAL "WIN32") # Win32 Desktop for now. # TODO: define a separate PAL for Win10 cmake build include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../zlib ${CMAKE_CURRENT_SOURCE_DIR}/../sqlite) -add_definitions(-D_UNICODE -DUNICODE -DZLIB_WINAPI -DWIN32 -DARIASDK_PLATFORM_WINDOWS=1 -DARIASDK_SHARED_LIB=1 -D_ARIA_UTC_SDK -D_CRT_SECURE_NO_WARNINGS -DUSE_BOND -D_WINDOWS -D_USRDLL -DWINVER=_WIN32_WINNT_WIN7) +add_definitions(-D_UNICODE -DUNICODE -DZLIB_WINAPI -DWIN32 -DMATSDK_PLATFORM_WINDOWS=1 -DMATSDK_SHARED_LIB=1 -D_UTC_SDK -D_CRT_SECURE_NO_WARNINGS -DUSE_BOND -D_WINDOWS -D_USRDLL -DWINVER=_WIN32_WINNT_WIN7) remove_definitions(-D_MBCS) list(APPEND SRCS http/HttpClient_WinInet.cpp diff --git a/lib/api/AllowedLevelsCollection.cpp b/lib/api/AllowedLevelsCollection.cpp index 1537895c..fe465ffc 100644 --- a/lib/api/AllowedLevelsCollection.cpp +++ b/lib/api/AllowedLevelsCollection.cpp @@ -2,7 +2,7 @@ #include "AllowedLevelsCollection.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { AllowedLevelsCollection::AllowedLevelsCollection(std::initializer_list&& allowedLevels) noexcept : m_allowedLevels(allowedLevels) @@ -32,4 +32,4 @@ namespace ARIASDK_NS_BEGIN m_allowedLevels = levels; } -} ARIASDK_NS_END \ No newline at end of file +} MAT_NS_END \ No newline at end of file diff --git a/lib/api/AllowedLevelsCollection.hpp b/lib/api/AllowedLevelsCollection.hpp index 0b5803d2..6d7b5136 100644 --- a/lib/api/AllowedLevelsCollection.hpp +++ b/lib/api/AllowedLevelsCollection.hpp @@ -10,7 +10,7 @@ #include "Version.hpp" #include "ctmacros.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class AllowedLevelsCollection @@ -30,6 +30,6 @@ namespace ARIASDK_NS_BEGIN std::vector m_allowedLevels; }; -} ARIASDK_NS_END +} MAT_NS_END #endif // ALLOWEDLEVELSCOLLECTION_HPP diff --git a/lib/api/AuthTokensController.cpp b/lib/api/AuthTokensController.cpp index 7762f0df..26c07168 100644 --- a/lib/api/AuthTokensController.cpp +++ b/lib/api/AuthTokensController.cpp @@ -4,7 +4,7 @@ #include "ILogManager.hpp" #include "utils/Utils.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { MATSDK_LOG_INST_COMPONENT_CLASS(AuthTokensController, "EventsSDK.AuthTokensController", "Events telemetry client - AuthTokensController class"); @@ -73,4 +73,4 @@ namespace ARIASDK_NS_BEGIN { return m_userTokens; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/api/AuthTokensController.hpp b/lib/api/AuthTokensController.hpp index fbf70ced..6bfd428a 100644 --- a/lib/api/AuthTokensController.hpp +++ b/lib/api/AuthTokensController.hpp @@ -11,7 +11,7 @@ #include // *INDENT-OFF* -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// /// This class is used to manage the Auth Tokens @@ -78,6 +78,6 @@ namespace ARIASDK_NS_BEGIN }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/api/ContextFieldsProvider.cpp b/lib/api/ContextFieldsProvider.cpp index f9ba3284..1593526e 100644 --- a/lib/api/ContextFieldsProvider.cpp +++ b/lib/api/ContextFieldsProvider.cpp @@ -6,7 +6,7 @@ #include "utils/Utils.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { ContextFieldsProvider::ContextFieldsProvider() @@ -463,4 +463,4 @@ namespace ARIASDK_NS_BEGIN return m_customContextFields; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/api/ContextFieldsProvider.hpp b/lib/api/ContextFieldsProvider.hpp index 5b0a5a77..d824381b 100644 --- a/lib/api/ContextFieldsProvider.hpp +++ b/lib/api/ContextFieldsProvider.hpp @@ -12,7 +12,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { // TODO: [MG] - A/B EXP code has to be refactored into separate module @@ -53,5 +53,5 @@ namespace ARIASDK_NS_BEGIN }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/api/CorrelationVector.cpp b/lib/api/CorrelationVector.cpp index ed23a989..4e932760 100644 --- a/lib/api/CorrelationVector.cpp +++ b/lib/api/CorrelationVector.cpp @@ -9,7 +9,7 @@ using std::string; using std::mutex; using std::vector; -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { // Note: CV spec reserves the last character for the "!" suffix identifying sealed values. // This effectively means we have one less character to use. @@ -313,4 +313,4 @@ namespace ARIASDK_NS_BEGIN return true; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/api/DataViewerCollection.cpp b/lib/api/DataViewerCollection.cpp index 628d1159..b83838e4 100644 --- a/lib/api/DataViewerCollection.cpp +++ b/lib/api/DataViewerCollection.cpp @@ -2,7 +2,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { MATSDK_LOG_INST_COMPONENT_CLASS(DataViewerCollection, "EventsSDK.DataViewerCollection", "Microsoft Telemetry Client - DataViewerCollection class"); @@ -108,4 +108,4 @@ namespace ARIASDK_NS_BEGIN { return nullptr; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/api/DataViewerCollection.hpp b/lib/api/DataViewerCollection.hpp index 67a70ce7..59953907 100644 --- a/lib/api/DataViewerCollection.hpp +++ b/lib/api/DataViewerCollection.hpp @@ -9,7 +9,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class DataViewerCollection : public IDataViewerCollection { @@ -39,6 +39,6 @@ namespace ARIASDK_NS_BEGIN { std::vector> m_dataViewerCollection; }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/api/ILogConfiguration.cpp b/lib/api/ILogConfiguration.cpp index ccc26ff4..2c4bf74c 100644 --- a/lib/api/ILogConfiguration.cpp +++ b/lib/api/ILogConfiguration.cpp @@ -1,6 +1,6 @@ #include "ILogConfiguration.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { ILogConfiguration::ILogConfiguration(const std::initializer_list>& initList) : m_configs(initList) { } @@ -35,4 +35,4 @@ namespace ARIASDK_NS_BEGIN return m_configs; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/api/IRuntimeConfig.hpp b/lib/api/IRuntimeConfig.hpp index e10b06c4..c559b2d8 100644 --- a/lib/api/IRuntimeConfig.hpp +++ b/lib/api/IRuntimeConfig.hpp @@ -10,7 +10,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { ///@cond INTERNAL_DOCS @@ -188,5 +188,5 @@ namespace ARIASDK_NS_BEGIN /// @endcond -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/api/LogConfiguration.cpp b/lib/api/LogConfiguration.cpp index f76ab431..97d58239 100644 --- a/lib/api/LogConfiguration.cpp +++ b/lib/api/LogConfiguration.cpp @@ -6,7 +6,7 @@ using json = nlohmann::json; #endif -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { static ILogConfiguration currentConfig { { CFG_INT_TRACE_LEVEL_MIN, ACTTraceLevel::ACTTraceLevel_Error }, @@ -118,4 +118,4 @@ namespace ARIASDK_NS_BEGIN { return result; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/api/LogManager.cpp b/lib/api/LogManager.cpp index ab3be01e..fbb57d36 100644 --- a/lib/api/LogManager.cpp +++ b/lib/api/LogManager.cpp @@ -8,7 +8,7 @@ using namespace std; -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class ModuleConfig : ILogConfiguration { @@ -20,6 +20,6 @@ namespace ARIASDK_NS_BEGIN { DEFINE_LOGMANAGER(LogManager, ModuleConfig); -} ARIASDK_NS_END +} MAT_NS_END #endif \ No newline at end of file diff --git a/lib/api/LogManagerFactory.cpp b/lib/api/LogManagerFactory.cpp index 132c418e..fb9c6b41 100644 --- a/lib/api/LogManagerFactory.cpp +++ b/lib/api/LogManagerFactory.cpp @@ -13,7 +13,7 @@ #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { // This mutex has to be recursive because we allow both // Destroy and destrutor to lock it. destructor could be @@ -250,4 +250,4 @@ namespace ARIASDK_NS_BEGIN } } -ARIASDK_NS_END +MAT_NS_END diff --git a/lib/api/LogManagerFactory.hpp b/lib/api/LogManagerFactory.hpp index e633f929..3781d4a3 100644 --- a/lib/api/LogManagerFactory.hpp +++ b/lib/api/LogManagerFactory.hpp @@ -12,7 +12,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { constexpr const char* ANYHOST = "*"; @@ -129,6 +129,6 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/api/LogManagerImpl.cpp b/lib/api/LogManagerImpl.cpp index ecae10f3..9945fda9 100644 --- a/lib/api/LogManagerImpl.cpp +++ b/lib/api/LogManagerImpl.cpp @@ -42,7 +42,7 @@ #endif #endif // HAVE_MAT_DEFAULT_FILTER -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { void DeadLoggers::AddMap(LoggerMap&& source) { @@ -726,4 +726,4 @@ namespace ARIASDK_NS_BEGIN } } -ARIASDK_NS_END +MAT_NS_END diff --git a/lib/api/LogManagerImpl.hpp b/lib/api/LogManagerImpl.hpp index b8fa7816..4bbfbc86 100644 --- a/lib/api/LogManagerImpl.hpp +++ b/lib/api/LogManagerImpl.hpp @@ -31,7 +31,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class ITelemetrySystem; @@ -325,6 +325,6 @@ namespace ARIASDK_NS_BEGIN }; } -ARIASDK_NS_END +MAT_NS_END #endif diff --git a/lib/api/LogManagerProvider.cpp b/lib/api/LogManagerProvider.cpp index 7fdc19be..426fc5dc 100644 --- a/lib/api/LogManagerProvider.cpp +++ b/lib/api/LogManagerProvider.cpp @@ -2,7 +2,7 @@ #include "LogManagerFactory.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { ILogManager * LogManagerProvider::Get( ILogConfiguration & config, @@ -40,4 +40,4 @@ namespace ARIASDK_NS_BEGIN { return LogManagerFactory::Release(config); } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/api/LogSessionData.cpp b/lib/api/LogSessionData.cpp index 8cf2bc29..32380861 100644 --- a/lib/api/LogSessionData.cpp +++ b/lib/api/LogSessionData.cpp @@ -14,7 +14,7 @@ using namespace std; -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { inline void remove_eol(string& result) { @@ -97,5 +97,5 @@ namespace ARIASDK_NS_BEGIN { return false; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/api/Logger.cpp b/lib/api/Logger.cpp index 1f376ac1..72833bd1 100644 --- a/lib/api/Logger.cpp +++ b/lib/api/Logger.cpp @@ -11,7 +11,7 @@ using namespace MAT; -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class ActiveLoggerCall { @@ -929,4 +929,4 @@ namespace ARIASDK_NS_BEGIN } } } -ARIASDK_NS_END +MAT_NS_END diff --git a/lib/api/Logger.hpp b/lib/api/Logger.hpp index 1093e7be..23c8a84d 100644 --- a/lib/api/Logger.hpp +++ b/lib/api/Logger.hpp @@ -21,7 +21,7 @@ #include "filter/EventFilterCollection.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class BaseDecorator; class ILogManagerInternal; @@ -284,6 +284,6 @@ namespace ARIASDK_NS_BEGIN friend class ActiveLoggerCall; }; } -ARIASDK_NS_END +MAT_NS_END #endif diff --git a/lib/backoff/Backoff_ExponentialWithJitter.hpp b/lib/backoff/Backoff_ExponentialWithJitter.hpp index 4575bc6f..24d9bb1b 100644 --- a/lib/backoff/Backoff_ExponentialWithJitter.hpp +++ b/lib/backoff/Backoff_ExponentialWithJitter.hpp @@ -9,7 +9,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { /// @@ -99,5 +99,5 @@ private: }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/backoff/IBackoff.cpp b/lib/backoff/IBackoff.cpp index 61470976..5811ed31 100644 --- a/lib/backoff/IBackoff.cpp +++ b/lib/backoff/IBackoff.cpp @@ -4,7 +4,7 @@ #include "Backoff_ExponentialWithJitter.hpp" #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { std::unique_ptr IBackoff::createFromConfig(std::string const& config) @@ -38,4 +38,4 @@ std::unique_ptr IBackoff::createFromConfig(std::string const& config) } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/backoff/IBackoff.hpp b/lib/backoff/IBackoff.hpp index 970b7854..e32489b9 100644 --- a/lib/backoff/IBackoff.hpp +++ b/lib/backoff/IBackoff.hpp @@ -7,7 +7,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { /// @@ -43,5 +43,5 @@ class IBackoff { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/bond/BondSerializer.cpp b/lib/bond/BondSerializer.cpp index 5fa0e015..3d020d29 100644 --- a/lib/bond/BondSerializer.cpp +++ b/lib/bond/BondSerializer.cpp @@ -7,7 +7,7 @@ #include "bond/generated/CsProtocol_readers.hpp" #include "oacr.h" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { bool BondSerializer::handleSerialize(IncomingEventContextPtr const& ctx) { @@ -25,4 +25,4 @@ namespace ARIASDK_NS_BEGIN { return true; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/bond/BondSerializer.hpp b/lib/bond/BondSerializer.hpp index 54361d4c..f99d5f78 100644 --- a/lib/bond/BondSerializer.hpp +++ b/lib/bond/BondSerializer.hpp @@ -4,7 +4,7 @@ #include "system/Contexts.hpp" #include "system/Route.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class BondSerializer { @@ -16,4 +16,4 @@ class BondSerializer { }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/bwcontrol/BandwidthController_ResourceManager.cpp b/lib/bwcontrol/BandwidthController_ResourceManager.cpp index fbcfacf6..087cac92 100644 --- a/lib/bwcontrol/BandwidthController_ResourceManager.cpp +++ b/lib/bwcontrol/BandwidthController_ResourceManager.cpp @@ -3,7 +3,7 @@ #include "BandwidthController_ResourceManager.hpp" #include "ResourceManager/RMPublic_BitStream.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { BandwidthController_ResourceManager::BandwidthController_ResourceManager(::resource_manager2::ResourceManagerPtr const& rm) @@ -55,4 +55,4 @@ unsigned BandwidthController_ResourceManager::GetProposedBandwidthBps() } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/bwcontrol/BandwidthController_ResourceManager.hpp b/lib/bwcontrol/BandwidthController_ResourceManager.hpp index 19d25013..97eb567e 100644 --- a/lib/bwcontrol/BandwidthController_ResourceManager.hpp +++ b/lib/bwcontrol/BandwidthController_ResourceManager.hpp @@ -4,7 +4,7 @@ #include "aria/IBandwidthController.hpp" #include "ResourceManager/ResourceManagerPublic.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class BandwidthController_ResourceManager : public IBandwidthController @@ -21,4 +21,4 @@ class BandwidthController_ResourceManager : public IBandwidthController }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/callbacks/DebugSource.cpp b/lib/callbacks/DebugSource.cpp index 8d5f6409..44010a52 100644 --- a/lib/callbacks/DebugSource.cpp +++ b/lib/callbacks/DebugSource.cpp @@ -5,7 +5,7 @@ #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { /// Add event listener for specific debug event type. void DebugEventSource::AddEventListener(DebugEventType type, DebugEventListener &listener) @@ -79,4 +79,4 @@ namespace ARIASDK_NS_BEGIN { return (cascaded.erase(&other)!=0); } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/compression/HttpDeflateCompression.cpp b/lib/compression/HttpDeflateCompression.cpp index 8511a247..6dd2d620 100644 --- a/lib/compression/HttpDeflateCompression.cpp +++ b/lib/compression/HttpDeflateCompression.cpp @@ -8,7 +8,7 @@ #include #endif -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { HttpDeflateCompression::HttpDeflateCompression(IRuntimeConfig& runtimeConfig) @@ -87,4 +87,4 @@ namespace ARIASDK_NS_BEGIN { } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/compression/HttpDeflateCompression.hpp b/lib/compression/HttpDeflateCompression.hpp index dff44ac1..41edf39e 100644 --- a/lib/compression/HttpDeflateCompression.hpp +++ b/lib/compression/HttpDeflateCompression.hpp @@ -6,7 +6,7 @@ #include "system/Route.hpp" #include "system/Contexts.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class HttpDeflateCompression { @@ -25,4 +25,4 @@ namespace ARIASDK_NS_BEGIN { RoutePassThrough compress{ this, &HttpDeflateCompression::handleCompress }; }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/config/RuntimeConfig_Default.hpp b/lib/config/RuntimeConfig_Default.hpp index 2fc41e21..b2319d69 100644 --- a/lib/config/RuntimeConfig_Default.hpp +++ b/lib/config/RuntimeConfig_Default.hpp @@ -4,7 +4,7 @@ #pragma once #include "api/IRuntimeConfig.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { static ILogConfiguration defaultRuntimeConfig{ {CFG_INT_TRACE_LEVEL_MIN, ACTTraceLevel::ACTTraceLevel_Error}, @@ -191,4 +191,4 @@ namespace ARIASDK_NS_BEGIN }; } -ARIASDK_NS_END +MAT_NS_END diff --git a/lib/decoder/PayloadDecoder.cpp b/lib/decoder/PayloadDecoder.cpp index ff77ca2d..a8265fb9 100644 --- a/lib/decoder/PayloadDecoder.cpp +++ b/lib/decoder/PayloadDecoder.cpp @@ -534,7 +534,7 @@ namespace clienttelemetry { using namespace clienttelemetry::data::v3; -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { namespace exporters { @@ -593,4 +593,4 @@ namespace ARIASDK_NS_BEGIN { } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/decorators/BaseDecorator.cpp b/lib/decorators/BaseDecorator.cpp index 5f1ec3a1..147cab6b 100644 --- a/lib/decorators/BaseDecorator.cpp +++ b/lib/decorators/BaseDecorator.cpp @@ -1,7 +1,7 @@ #include "mat/config.h" #include "BaseDecorator.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { BaseDecorator::BaseDecorator(ILogManager& owner) : @@ -68,4 +68,4 @@ namespace ARIASDK_NS_BEGIN { return true; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/decorators/BaseDecorator.hpp b/lib/decorators/BaseDecorator.hpp index d30e010a..47c93935 100644 --- a/lib/decorators/BaseDecorator.hpp +++ b/lib/decorators/BaseDecorator.hpp @@ -13,7 +13,7 @@ #include "system/ITelemetrySystem.hpp" #include "utils/Utils.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class BaseDecorator : public IDecorator @@ -126,6 +126,6 @@ namespace ARIASDK_NS_BEGIN }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/decorators/EventPropertiesDecorator.hpp b/lib/decorators/EventPropertiesDecorator.hpp index 2602ea02..73ff8061 100644 --- a/lib/decorators/EventPropertiesDecorator.hpp +++ b/lib/decorators/EventPropertiesDecorator.hpp @@ -11,7 +11,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { // Bit remapping has to happen on bits passed via API surface. // Ref CS2.1+ : https://osgwiki.com/wiki/CommonSchema/flags @@ -450,5 +450,5 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/decorators/SemanticApiDecorators.hpp b/lib/decorators/SemanticApiDecorators.hpp index 1deff3d4..faf9ef40 100644 --- a/lib/decorators/SemanticApiDecorators.hpp +++ b/lib/decorators/SemanticApiDecorators.hpp @@ -5,7 +5,7 @@ #include "BaseDecorator.hpp" #include "ILogger.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { #define RECORD_EXT record.data[0].properties @@ -290,5 +290,5 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/decorators/SemanticContextDecorator.hpp b/lib/decorators/SemanticContextDecorator.hpp index ac4250a9..35de0cf2 100644 --- a/lib/decorators/SemanticContextDecorator.hpp +++ b/lib/decorators/SemanticContextDecorator.hpp @@ -5,7 +5,7 @@ #include "IDecorator.hpp" #include "api/ContextFieldsProvider.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class SemanticContextDecorator : public IDecorator @@ -42,5 +42,5 @@ namespace ARIASDK_NS_BEGIN }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/filter/EventFilterCollection.cpp b/lib/filter/EventFilterCollection.cpp index 4bff5b09..5ae2f23f 100644 --- a/lib/filter/EventFilterCollection.cpp +++ b/lib/filter/EventFilterCollection.cpp @@ -7,7 +7,7 @@ #include #endif -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { void EventFilterCollection::RegisterEventFilter(std::unique_ptr&& filter) { @@ -66,4 +66,4 @@ namespace ARIASDK_NS_BEGIN return (Size() == 0); } -} ARIASDK_NS_END \ No newline at end of file +} MAT_NS_END \ No newline at end of file diff --git a/lib/filter/EventFilterCollection.hpp b/lib/filter/EventFilterCollection.hpp index 6931b28b..c6584f50 100644 --- a/lib/filter/EventFilterCollection.hpp +++ b/lib/filter/EventFilterCollection.hpp @@ -10,7 +10,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class EventFilterCollection : public IEventFilterCollection { @@ -28,6 +28,6 @@ namespace ARIASDK_NS_BEGIN std::vector> m_filters; }; -} ARIASDK_NS_END +} MAT_NS_END #endif // EVENTFILTERCOLLECTION_HPP \ No newline at end of file diff --git a/lib/http/HttpClientFactory.cpp b/lib/http/HttpClientFactory.cpp index 84b7b2c7..347d6e6d 100644 --- a/lib/http/HttpClientFactory.cpp +++ b/lib/http/HttpClientFactory.cpp @@ -28,7 +28,7 @@ #error The library cannot work without an HTTP client implementation. #endif -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { MATSDK_LOG_INST_COMPONENT_CLASS(HttpClientFactory, "EventsSDK.HttpClientFactory", "Events telemetry client - HttpClientFactory class"); @@ -73,7 +73,7 @@ namespace ARIASDK_NS_BEGIN { #error The library cannot work without an HTTP client implementation. #endif -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/http/HttpClientFactory.hpp b/lib/http/HttpClientFactory.hpp index 935a6e22..d59c3d5f 100644 --- a/lib/http/HttpClientFactory.hpp +++ b/lib/http/HttpClientFactory.hpp @@ -7,7 +7,7 @@ #include "IHttpClient.hpp" #include "pal/PAL.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class HttpClientFactory { @@ -18,7 +18,7 @@ private: MATSDK_LOG_DECL_COMPONENT_CLASS(); }; -} ARIASDK_NS_END +} MAT_NS_END // TODO: [maxgolov] - remove this once there is a better way to pass HTTP client configuration #if defined(MATSDK_PAL_WIN32) && !defined(_WINRT_DLL) diff --git a/lib/http/HttpClientManager.cpp b/lib/http/HttpClientManager.cpp index a9583cf8..3b0edccb 100644 --- a/lib/http/HttpClientManager.cpp +++ b/lib/http/HttpClientManager.cpp @@ -22,7 +22,7 @@ // Linux and Mac OS X with libcurl require an async handler for now #endif -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class HttpClientManager::HttpCallback : public IHttpResponseCallback @@ -152,4 +152,4 @@ namespace ARIASDK_NS_BEGIN { // start async cancellation -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/http/HttpClientManager.hpp b/lib/http/HttpClientManager.hpp index f59f58a5..d3727f40 100644 --- a/lib/http/HttpClientManager.hpp +++ b/lib/http/HttpClientManager.hpp @@ -10,7 +10,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class HttpClientManager @@ -55,4 +55,4 @@ class HttpClientManager std::list m_httpCallbacks; }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/http/HttpClient_Android.cpp b/lib/http/HttpClient_Android.cpp index 339afa99..65a8e884 100644 --- a/lib/http/HttpClient_Android.cpp +++ b/lib/http/HttpClient_Android.cpp @@ -5,7 +5,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { constexpr static auto Tag = "HttpClient_Android"; @@ -419,7 +419,7 @@ HttpClient_Android::GetClientInstance() std::shared_ptr HttpClient_Android::s_client; std::string HttpClient_Android::s_cache_file_path; -} ARIASDK_NS_END +} MAT_NS_END extern "C" JNIEXPORT void diff --git a/lib/http/HttpClient_Android.hpp b/lib/http/HttpClient_Android.hpp index 58b38a3e..362ee887 100644 --- a/lib/http/HttpClient_Android.hpp +++ b/lib/http/HttpClient_Android.hpp @@ -7,7 +7,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class HttpClient_Android : public IHttpClient { @@ -199,4 +199,4 @@ protected: }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/http/HttpClient_Apple.hpp b/lib/http/HttpClient_Apple.hpp index 054561a0..724755b1 100644 --- a/lib/http/HttpClient_Apple.hpp +++ b/lib/http/HttpClient_Apple.hpp @@ -8,7 +8,7 @@ #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class HttpClient_Apple : public IHttpClient { public: @@ -28,7 +28,7 @@ namespace ARIASDK_NS_BEGIN { std::map m_requests; }; -} ARIASDK_NS_END +} MAT_NS_END #endif // HTTPCLIENT_APPLE_HPP diff --git a/lib/http/HttpClient_Apple.mm b/lib/http/HttpClient_Apple.mm index 342edc90..5b6bf408 100644 --- a/lib/http/HttpClient_Apple.mm +++ b/lib/http/HttpClient_Apple.mm @@ -11,7 +11,7 @@ #include "HttpClient_Apple.hpp" #include "utils/Utils.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { static std::string NextReqId() { @@ -220,6 +220,6 @@ void HttpClient_Apple::Add(IHttpRequest* req) m_requests[req->GetId()] = req; } -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/http/HttpClient_CAPI.cpp b/lib/http/HttpClient_CAPI.cpp index e2440ff9..79c9f1a4 100644 --- a/lib/http/HttpClient_CAPI.cpp +++ b/lib/http/HttpClient_CAPI.cpp @@ -6,7 +6,7 @@ #include "utils/Utils.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { // Represents a single in-flight, cancellable HTTP operation class HttpClient_Operation @@ -219,4 +219,4 @@ namespace ARIASDK_NS_BEGIN { } } -} ARIASDK_NS_END \ No newline at end of file +} MAT_NS_END \ No newline at end of file diff --git a/lib/http/HttpClient_CAPI.hpp b/lib/http/HttpClient_CAPI.hpp index 98569db4..c6501a31 100644 --- a/lib/http/HttpClient_CAPI.hpp +++ b/lib/http/HttpClient_CAPI.hpp @@ -8,7 +8,7 @@ #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class HttpClient_CAPI : public IHttpClient { public: @@ -25,6 +25,6 @@ namespace ARIASDK_NS_BEGIN { std::mutex m_requestsMutex; }; -} ARIASDK_NS_END +} MAT_NS_END #endif // HTTPCLIENT_CAPI_HPP \ No newline at end of file diff --git a/lib/http/HttpClient_Curl.cpp b/lib/http/HttpClient_Curl.cpp index 992b3516..715365d3 100644 --- a/lib/http/HttpClient_Curl.cpp +++ b/lib/http/HttpClient_Curl.cpp @@ -12,7 +12,7 @@ #include "utils/Utils.hpp" #include "HttpClient_Curl.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { static std::string NextReqId() { static std::atomic seq(0); @@ -134,6 +134,6 @@ namespace ARIASDK_NS_BEGIN { m_requests[request->GetId()] = request; } -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/http/HttpClient_Curl.hpp b/lib/http/HttpClient_Curl.hpp index 85f9d8f1..37a2ff55 100644 --- a/lib/http/HttpClient_Curl.hpp +++ b/lib/http/HttpClient_Curl.hpp @@ -33,7 +33,7 @@ #undef TRACE #define TRACE(...) // printf -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { /** * Curl-based HTTP client @@ -520,7 +520,7 @@ protected: }; -} ARIASDK_NS_END +} MAT_NS_END #endif // HAVE_MAT_DEFAULT_HTTP_CLIENT diff --git a/lib/http/HttpClient_WinInet.cpp b/lib/http/HttpClient_WinInet.cpp index b493e1e7..f9411b08 100644 --- a/lib/http/HttpClient_WinInet.cpp +++ b/lib/http/HttpClient_WinInet.cpp @@ -17,7 +17,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class WinInetRequestWrapper { @@ -557,7 +557,7 @@ bool HttpClient_WinInet::IsMsRootCheckRequired() return m_msRootCheck; } -} ARIASDK_NS_END +} MAT_NS_END #pragma warning(pop) #endif // HAVE_MAT_DEFAULT_HTTP_CLIENT // clang-format on diff --git a/lib/http/HttpClient_WinInet.hpp b/lib/http/HttpClient_WinInet.hpp index a9514312..51705ec0 100644 --- a/lib/http/HttpClient_WinInet.hpp +++ b/lib/http/HttpClient_WinInet.hpp @@ -9,7 +9,7 @@ #include "ILogManager.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { #ifndef _WININET_ typedef void* HINTERNET; @@ -43,7 +43,7 @@ class HttpClient_WinInet : public IHttpClient { friend class WinInetRequestWrapper; }; -} ARIASDK_NS_END +} MAT_NS_END #endif // HAVE_MAT_DEFAULT_HTTP_CLIENT diff --git a/lib/http/HttpClient_WinRt.cpp b/lib/http/HttpClient_WinRt.cpp index 1b46bdbc..11b817db 100644 --- a/lib/http/HttpClient_WinRt.cpp +++ b/lib/http/HttpClient_WinRt.cpp @@ -27,7 +27,7 @@ using namespace concurrency; using namespace Platform; -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class WinRtRequestWrapper { @@ -356,6 +356,6 @@ namespace ARIASDK_NS_BEGIN { } }; -} ARIASDK_NS_END +} MAT_NS_END #endif //HAVE_MAT_DEFAULT_HTTP_CLIENT \ No newline at end of file diff --git a/lib/http/HttpClient_WinRt.hpp b/lib/http/HttpClient_WinRt.hpp index 166d15c6..8d8fc8e1 100644 --- a/lib/http/HttpClient_WinRt.hpp +++ b/lib/http/HttpClient_WinRt.hpp @@ -21,7 +21,7 @@ using namespace ::Windows::Web::Http; using namespace ::Windows::Web::Http::Filters; using namespace ::Windows::Web::Http::Headers; -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class WinRtRequestWrapper; @@ -47,7 +47,7 @@ class HttpClient_WinRt : public IHttpClient { friend class WinRtRequestWrapper; }; -} ARIASDK_NS_END +} MAT_NS_END #endif // HAVE_MAT_DEFAULT_HTTP_CLIENT diff --git a/lib/http/HttpRequestEncoder.cpp b/lib/http/HttpRequestEncoder.cpp index c634ae1b..d31488b7 100644 --- a/lib/http/HttpRequestEncoder.cpp +++ b/lib/http/HttpRequestEncoder.cpp @@ -12,7 +12,7 @@ #include "bond/generated/CsProtocol_writers.hpp" #include "bond/generated/CsProtocol_readers.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { HttpRequestEncoder::HttpRequestEncoder(ITelemetrySystem& system, IHttpClient& httpClient) @@ -160,4 +160,4 @@ namespace ARIASDK_NS_BEGIN { return true; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/http/HttpRequestEncoder.hpp b/lib/http/HttpRequestEncoder.hpp index 9507a544..0f2379b2 100644 --- a/lib/http/HttpRequestEncoder.hpp +++ b/lib/http/HttpRequestEncoder.hpp @@ -11,7 +11,7 @@ #include "IAuthTokensController.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class HttpRequestEncoder { public: @@ -36,4 +36,4 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/http/HttpResponseDecoder.cpp b/lib/http/HttpResponseDecoder.cpp index 4314165f..44406d76 100644 --- a/lib/http/HttpResponseDecoder.cpp +++ b/lib/http/HttpResponseDecoder.cpp @@ -11,7 +11,7 @@ #include "json.hpp" #endif -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { HttpResponseDecoder::HttpResponseDecoder(ITelemetrySystem& system) : @@ -231,4 +231,4 @@ namespace ARIASDK_NS_BEGIN { #endif } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/http/HttpResponseDecoder.hpp b/lib/http/HttpResponseDecoder.hpp index d8d9b040..4cf98086 100644 --- a/lib/http/HttpResponseDecoder.hpp +++ b/lib/http/HttpResponseDecoder.hpp @@ -8,7 +8,7 @@ #include "system/Contexts.hpp" #include "system/ITelemetrySystem.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { typedef enum { @@ -41,5 +41,5 @@ namespace ARIASDK_NS_BEGIN { virtual bool DispatchEvent(DebugEvent evt) override; }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/mat/IBandwidthController.hpp b/lib/include/mat/IBandwidthController.hpp index 0fffb7d4..970553a3 100644 --- a/lib/include/mat/IBandwidthController.hpp +++ b/lib/include/mat/IBandwidthController.hpp @@ -4,7 +4,7 @@ #include "Version.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { ///@cond INTERNAL_DOCS @@ -27,5 +27,5 @@ namespace ARIASDK_NS_BEGIN /// @endcond -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/mat/IOfflineStorage.hpp b/lib/include/mat/IOfflineStorage.hpp index becd2d62..6744b38d 100644 --- a/lib/include/mat/IOfflineStorage.hpp +++ b/lib/include/mat/IOfflineStorage.hpp @@ -12,7 +12,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { constexpr unsigned int DB_FULL_NOTIFICATION_DEFAULT_PERCENTAGE = 75; constexpr uint64_t DB_FULL_CHECK_INTERVAL_DEFAULT_MS = 5000; @@ -319,5 +319,5 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/AggregatedMetric.hpp b/lib/include/public/AggregatedMetric.hpp index 3460d7af..71afd610 100644 --- a/lib/include/public/AggregatedMetric.hpp +++ b/lib/include/public/AggregatedMetric.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef AGGREGATEDMETRIC_HPP #define AGGREGATEDMETRIC_HPP @@ -6,7 +20,7 @@ #include "ILogger.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { namespace Models { @@ -72,5 +86,5 @@ namespace ARIASDK_NS_BEGIN } // Models -} ARIASDK_NS_END +} MAT_NS_END #endif \ No newline at end of file diff --git a/lib/include/public/CAPIClient.hpp b/lib/include/public/CAPIClient.hpp index d0efdba7..765dfceb 100644 --- a/lib/include/public/CAPIClient.hpp +++ b/lib/include/public/CAPIClient.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef EVENTSCLIENT_HPP #define EVENTSCLIENT_HPP // @@ -14,7 +28,7 @@ #undef evt_log #endif -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class CAPIClient @@ -89,6 +103,6 @@ namespace ARIASDK_NS_BEGIN }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/CommonFields.h b/lib/include/public/CommonFields.h index b1c58334..3d6c7d4d 100644 --- a/lib/include/public/CommonFields.h +++ b/lib/include/public/CommonFields.h @@ -1,4 +1,18 @@ -/* Copyright (c) Microsoft. All rights reserved. */ +/* + + Copyright (c) 2020 Microsoft Corporation. All rights reserved. + + This code is licensed under the MIT License (MIT). + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +*/ #ifndef MAT_COMMONFIELDS_H #define MAT_COMMONFIELDS_H diff --git a/lib/include/public/CompliantByDefaultFilterApi.hpp b/lib/include/public/CompliantByDefaultFilterApi.hpp index 4f1ec1e2..51c2646c 100644 --- a/lib/include/public/CompliantByDefaultFilterApi.hpp +++ b/lib/include/public/CompliantByDefaultFilterApi.hpp @@ -1,3 +1,18 @@ +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef COMPLIANTBYDEFAULTEVENTFILTERAPI_HPP #define COMPLIANTBYDEFAULTEVENTFILTERAPI_HPP @@ -6,11 +21,11 @@ #include -namespace ARIASDK_NS_BEGIN { namespace Modules { namespace Filtering +namespace MAT_NS_BEGIN { namespace Modules { namespace Filtering { MATSDK_LIBABI void UpdateAllowedLevels(const std::vector& allowedLevels) noexcept; -}}} ARIASDK_NS_END +}}} MAT_NS_END #endif // !COMPLIANTBYDEFAULTEVENTFILTERAPI_HPP diff --git a/lib/include/public/CorrelationVector.hpp b/lib/include/public/CorrelationVector.hpp index 1af2c769..7f084467 100644 --- a/lib/include/public/CorrelationVector.hpp +++ b/lib/include/public/CorrelationVector.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef CORRELATIONVECTOR_HPP #define CORRELATIONVECTOR_HPP @@ -8,7 +22,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { // Implementation of the Common Schema standard vector clock type. // Class methods are thread-safe. @@ -142,5 +156,5 @@ namespace ARIASDK_NS_BEGIN size_t GetDigitCount(size_t value); }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/CsProtocol_types.hpp b/lib/include/public/CsProtocol_types.hpp index 4bb2fe05..4375398e 100644 --- a/lib/include/public/CsProtocol_types.hpp +++ b/lib/include/public/CsProtocol_types.hpp @@ -1,3 +1,18 @@ +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// //------------------------------------------------------------------------------ // This code was generated by a tool. // diff --git a/lib/include/public/DebugEvents.hpp b/lib/include/public/DebugEvents.hpp index 20819001..5b29928e 100644 --- a/lib/include/public/DebugEvents.hpp +++ b/lib/include/public/DebugEvents.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef DEBUGEVENTS_HPP #define DEBUGEVENTS_HPP @@ -35,7 +49,7 @@ public: #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// @@ -243,6 +257,6 @@ namespace ARIASDK_NS_BEGIN #pragma warning( pop ) #endif -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/Enums.hpp b/lib/include/public/Enums.hpp index 441fe667..2c4935b0 100644 --- a/lib/include/public/Enums.hpp +++ b/lib/include/public/Enums.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_ENUMS_HPP #define MAT_ENUMS_HPP @@ -12,7 +26,7 @@ #include #endif -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// @@ -563,6 +577,6 @@ namespace ARIASDK_NS_BEGIN constexpr const static unsigned gc_NumDroppedReasons = DROPPED_REASON_COUNT; -} ARIASDK_NS_END +} MAT_NS_END #endif //EVENTPRIORITY_H diff --git a/lib/include/public/EventProperties.hpp b/lib/include/public/EventProperties.hpp index 322fc522..6166df98 100644 --- a/lib/include/public/EventProperties.hpp +++ b/lib/include/public/EventProperties.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef EVENTPROPERTIES_HPP #define EVENTPROPERTIES_HPP @@ -19,7 +33,7 @@ #include "mat.h" #endif -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { struct EventPropertiesStorage; @@ -349,6 +363,6 @@ namespace ARIASDK_NS_BEGIN EventPropertiesStorage* m_storage; }; -} ARIASDK_NS_END +} MAT_NS_END #endif \ No newline at end of file diff --git a/lib/include/public/EventProperty.hpp b/lib/include/public/EventProperty.hpp index 201ee379..4f2d498e 100644 --- a/lib/include/public/EventProperty.hpp +++ b/lib/include/public/EventProperty.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_EVENTPROPERTY_HPP #define MAT_EVENTPROPERTY_HPP @@ -26,7 +40,7 @@ #endif #endif -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// @@ -518,6 +532,6 @@ namespace ARIASDK_NS_BEGIN }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/IAFDClient.hpp b/lib/include/public/IAFDClient.hpp index 7e3e3710..251cd4c1 100644 --- a/lib/include/public/IAFDClient.hpp +++ b/lib/include/public/IAFDClient.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef IAFGCLIENT_HPP #define IAFGCLIENT_HPP diff --git a/lib/include/public/IAuthTokensController.hpp b/lib/include/public/IAuthTokensController.hpp index 40084436..39eacb27 100644 --- a/lib/include/public/IAuthTokensController.hpp +++ b/lib/include/public/IAuthTokensController.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_IAUTHTOKENS_HPP #define MAT_IAUTHTOKENS_HPP @@ -6,7 +20,7 @@ #include "ctmacros.hpp" #include "Enums.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { const char* const TICKETS_PREPEND_STRING = "1000"; @@ -66,6 +80,6 @@ namespace ARIASDK_NS_BEGIN }; -} ARIASDK_NS_END +} MAT_NS_END #endif //MAT_IAUTHTOKENS_HPP \ No newline at end of file diff --git a/lib/include/public/IBandwidthController.hpp b/lib/include/public/IBandwidthController.hpp index 4d409cc2..401d5641 100644 --- a/lib/include/public/IBandwidthController.hpp +++ b/lib/include/public/IBandwidthController.hpp @@ -1,10 +1,24 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef IBANDWIDTHCONTROLLER_HPP #define IBANDWIDTHCONTROLLER_HPP #include "Version.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class IBandwidthController { public: @@ -23,6 +37,6 @@ namespace ARIASDK_NS_BEGIN /// Proposed bandwidth in bytes per second virtual unsigned GetProposedBandwidthBps() = 0; }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/IDataViewer.hpp b/lib/include/public/IDataViewer.hpp index 75f30274..7f95954e 100644 --- a/lib/include/public/IDataViewer.hpp +++ b/lib/include/public/IDataViewer.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef IDATAVIEWER_HPP #define IDATAVIEWER_HPP @@ -9,7 +23,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// /// This interface allows SDK users to register a data viewer @@ -42,6 +56,6 @@ namespace ARIASDK_NS_BEGIN virtual const std::string& GetCurrentEndpoint() const noexcept = 0; }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/IDataViewerCollection.hpp b/lib/include/public/IDataViewerCollection.hpp index c2c35104..82cc2f86 100644 --- a/lib/include/public/IDataViewerCollection.hpp +++ b/lib/include/public/IDataViewerCollection.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef IDATAVIEWERCOLLECTION_HPP #define IDATAVIEWERCOLLECTION_HPP @@ -7,7 +21,7 @@ #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// /// This interface allows SDK users to register a data viewer @@ -63,6 +77,6 @@ namespace ARIASDK_NS_BEGIN virtual bool IsViewerRegistered(const char* viewerName) const = 0; }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/IDecorator.hpp b/lib/include/public/IDecorator.hpp index 95a1c29c..7923e247 100644 --- a/lib/include/public/IDecorator.hpp +++ b/lib/include/public/IDecorator.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef IDECORATOR_HPP #define IDECORATOR_HPP @@ -8,7 +22,7 @@ #include "CsProtocol_types.hpp" #include "ILogManager.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { /// /// Interface that allows to decorate outgoing Common Schema protocol Record. @@ -58,5 +72,5 @@ namespace ARIASDK_NS_BEGIN { } }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/IECSClient.hpp b/lib/include/public/IECSClient.hpp index f4fc8860..0ca86722 100644 --- a/lib/include/public/IECSClient.hpp +++ b/lib/include/public/IECSClient.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef IECSCLIENT_HPP #define IECSCLIENT_HPP diff --git a/lib/include/public/IEventFilter.hpp b/lib/include/public/IEventFilter.hpp index 7af48611..759cd8b7 100644 --- a/lib/include/public/IEventFilter.hpp +++ b/lib/include/public/IEventFilter.hpp @@ -1,11 +1,25 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef IEVENTFILTER_HPP #define IEVENTFILTER_HPP #include "Version.hpp" #include "EventProperties.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// /// Interface describing a generic filter for events. @@ -30,6 +44,6 @@ namespace ARIASDK_NS_BEGIN virtual bool CanEventPropertiesBeSent(const EventProperties& properties) const noexcept = 0; }; -} ARIASDK_NS_END +} MAT_NS_END #endif // IEVENTFILTER_HPP \ No newline at end of file diff --git a/lib/include/public/IEventFilterCollection.hpp b/lib/include/public/IEventFilterCollection.hpp index c47656a1..498fb2d2 100644 --- a/lib/include/public/IEventFilterCollection.hpp +++ b/lib/include/public/IEventFilterCollection.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef IEVENTFILTERCOLLECTION_HPP #define IEVENTFILTERCOLLECTION_HPP @@ -7,7 +21,7 @@ #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// /// Inerface providing registration and unregistration functions for IEventFilters @@ -61,6 +75,6 @@ namespace ARIASDK_NS_BEGIN virtual bool Empty() const noexcept = 0; }; -} ARIASDK_NS_END +} MAT_NS_END #endif // IEVENTFILTERCOLLECTION_HPP \ No newline at end of file diff --git a/lib/include/public/IHttpClient.hpp b/lib/include/public/IHttpClient.hpp index cb946134..8c4d00b1 100644 --- a/lib/include/public/IHttpClient.hpp +++ b/lib/include/public/IHttpClient.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef IHTTPCLIENT_HPP #define IHTTPCLIENT_HPP @@ -13,7 +27,7 @@ #include ///@cond INTERNAL_DOCS -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// /// The HttpHeaders class contains a set of HTTP headers. @@ -544,6 +558,6 @@ namespace ARIASDK_NS_BEGIN /// @endcond -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/ILogConfiguration.hpp b/lib/include/public/ILogConfiguration.hpp index 882012f4..9d38ba3f 100644 --- a/lib/include/public/ILogConfiguration.hpp +++ b/lib/include/public/ILogConfiguration.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_ILOGCONFIGURATION_HPP #define MAT_ILOGCONFIGURATION_HPP @@ -14,7 +28,7 @@ #include "IModule.hpp" #include "Variant.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class IModule; class IHttpClient; @@ -417,5 +431,5 @@ namespace ARIASDK_NS_BEGIN #endif } -ARIASDK_NS_END +MAT_NS_END #endif diff --git a/lib/include/public/ILogManager.hpp b/lib/include/public/ILogManager.hpp index f06605c7..08978c79 100644 --- a/lib/include/public/ILogManager.hpp +++ b/lib/include/public/ILogManager.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef ILOGMANAGER_HPP #define ILOGMANAGER_HPP @@ -20,7 +34,7 @@ #include "DebugEvents.hpp" #include "TransmitProfiles.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class IContextProvider { @@ -359,6 +373,6 @@ namespace ARIASDK_NS_BEGIN }; } -ARIASDK_NS_END +MAT_NS_END #endif diff --git a/lib/include/public/ILogger.hpp b/lib/include/public/ILogger.hpp index cd7f95bd..d3705690 100644 --- a/lib/include/public/ILogger.hpp +++ b/lib/include/public/ILogger.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_ILOGGER_HPP #define MAT_ILOGGER_HPP @@ -15,7 +29,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /* Data Type Flags */ @@ -621,6 +635,6 @@ Refer to https://osgwiki.com/wiki/Common_Schema_Event_Overrides for details on t }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/IModule.hpp b/lib/include/public/IModule.hpp index 711a0b5b..43f994c0 100644 --- a/lib/include/public/IModule.hpp +++ b/lib/include/public/IModule.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef IMODULE_HPP #define IMODULE_HPP @@ -6,7 +20,7 @@ #include "ctmacros.hpp" ///@cond INTERNAL_DOCS -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class ILogManager; @@ -36,6 +50,6 @@ namespace ARIASDK_NS_BEGIN /// @endcond -} ARIASDK_NS_END +} MAT_NS_END #endif // IMODULE_HPP diff --git a/lib/include/public/ISemanticContext.hpp b/lib/include/public/ISemanticContext.hpp index 06e60b3f..6f04f176 100644 --- a/lib/include/public/ISemanticContext.hpp +++ b/lib/include/public/ISemanticContext.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef ISEMANTICCONTEXT_HPP #define ISEMANTICCONTEXT_HPP @@ -12,7 +26,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// class MATSDK_LIBABI ISemanticContext @@ -268,6 +282,6 @@ namespace ARIASDK_NS_BEGIN virtual void SetTicket(TicketType /*type*/, std::string const& /*ticketValue*/) {}; }; -} ARIASDK_NS_END +} MAT_NS_END #endif //ISEMANTICCONTEXT_H diff --git a/lib/include/public/ITaskDispatcher.hpp b/lib/include/public/ITaskDispatcher.hpp index 60ef2f02..418be7cf 100644 --- a/lib/include/public/ITaskDispatcher.hpp +++ b/lib/include/public/ITaskDispatcher.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef ITASKDISPATCHER_HPP #define ITASKDISPATCHER_HPP @@ -11,7 +25,7 @@ #include ///@cond INTERNAL_DOCS -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// /// The Task class represents a single executable task that can be dispatched to an asynchronous worker @@ -123,6 +137,6 @@ namespace ARIASDK_NS_BEGIN /// @endcond -} ARIASDK_NS_END +} MAT_NS_END #endif // ITASKDISPATCHER_HPP diff --git a/lib/include/public/LogConfiguration.hpp b/lib/include/public/LogConfiguration.hpp index 9fb7ac68..c0e68fb7 100644 --- a/lib/include/public/LogConfiguration.hpp +++ b/lib/include/public/LogConfiguration.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_LOGCONFIGURATION_HPP #define MAT_LOGCONFIGURATION_HPP @@ -97,7 +111,7 @@ namespace Microsoft { } } -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { MATSDK_LIBABI const ILogConfiguration& GetDefaultConfiguration(); @@ -105,6 +119,6 @@ namespace ARIASDK_NS_BEGIN { MATSDK_LIBABI ILogConfiguration FromJSON(const char* json); -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/LogManager.hpp b/lib/include/public/LogManager.hpp index b7d65a6d..a56acfbe 100644 --- a/lib/include/public/LogManager.hpp +++ b/lib/include/public/LogManager.hpp @@ -1,14 +1,28 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_LOGMANAGER_V1_HPP #define MAT_LOGMANAGER_V1_HPP // Example implementation of a 'classic' v1 LogManager API surface #include "LogManagerBase.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class ModuleLogConfiguration : public ILogConfiguration {}; class LogManager : public LogManagerBase {}; -} ARIASDK_NS_END +} MAT_NS_END -#define LOGMANAGER_INSTANCE namespace ARIASDK_NS_BEGIN { DEFINE_LOGMANAGER(LogManager, ModuleLogConfiguration); } ARIASDK_NS_END +#define LOGMANAGER_INSTANCE namespace MAT_NS_BEGIN { DEFINE_LOGMANAGER(LogManager, ModuleLogConfiguration); } MAT_NS_END #endif diff --git a/lib/include/public/LogManagerBase.hpp b/lib/include/public/LogManagerBase.hpp index a5380930..78af0c2d 100644 --- a/lib/include/public/LogManagerBase.hpp +++ b/lib/include/public/LogManagerBase.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_LOGMANAGER_HPP #define MAT_LOGMANAGER_HPP @@ -98,7 +112,7 @@ ref class LogManagerLock std::lock_guard TOKENPASTE2(__guard_, __LINE__)(macro_mutex); #endif -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { #if (HAVE_EXCEPTIONS) class LogManagerNotInitializedException : public std::runtime_error @@ -709,7 +723,7 @@ namespace ARIASDK_NS_BEGIN #endif } -ARIASDK_NS_END +MAT_NS_END #pragma clang diagnostic pop diff --git a/lib/include/public/LogManagerProvider.hpp b/lib/include/public/LogManagerProvider.hpp index 4818f0f2..30c0fa34 100644 --- a/lib/include/public/LogManagerProvider.hpp +++ b/lib/include/public/LogManagerProvider.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_LOGMANAGER_PROVIDER_HPP #define MAT_LOGMANAGER_PROVIDER_HPP @@ -8,7 +22,7 @@ #include "ITaskDispatcher.hpp" #include "NullObjects.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// @@ -183,6 +197,6 @@ namespace ARIASDK_NS_BEGIN /// capi_client * capi_get_client(evt_handle_t handle); -} ARIASDK_NS_END +} MAT_NS_END #endif //MAT_LOGMANAGER_PROVIDER_HPP diff --git a/lib/include/public/LogSessionData.hpp b/lib/include/public/LogSessionData.hpp index d364cd16..57ffa9e4 100644 --- a/lib/include/public/LogSessionData.hpp +++ b/lib/include/public/LogSessionData.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef LOGSESSIONDATA_HPP #define LOGSESSIONDATA_HPP @@ -6,7 +20,7 @@ #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// @@ -48,5 +62,5 @@ namespace ARIASDK_NS_BEGIN }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/NullObjects.hpp b/lib/include/public/NullObjects.hpp index 73c63021..ff991dfb 100644 --- a/lib/include/public/NullObjects.hpp +++ b/lib/include/public/NullObjects.hpp @@ -1,11 +1,25 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_NULLOBJECTS_HPP #define MAT_NULLOBJECTS_HPP #include "ILogManager.hpp" #include "ILogger.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class NullContext : public ISemanticContext @@ -367,6 +381,6 @@ namespace ARIASDK_NS_BEGIN NullEventFilterCollection m_filters; }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/PayloadDecoder.hpp b/lib/include/public/PayloadDecoder.hpp index cc251c81..a16b7ce1 100644 --- a/lib/include/public/PayloadDecoder.hpp +++ b/lib/include/public/PayloadDecoder.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef PAYLOADDECODER_HPP #define PAYLOADDECODER_HPP @@ -19,7 +33,7 @@ namespace CsProtocol struct Record; }; -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { namespace exporters { @@ -46,6 +60,6 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/TransmitProfiles.hpp b/lib/include/public/TransmitProfiles.hpp index 58b9584b..3ccaeab7 100644 --- a/lib/include/public/TransmitProfiles.hpp +++ b/lib/include/public/TransmitProfiles.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef TRANSMITPROFILES_HPP #define TRANSMITPROFILES_HPP @@ -16,7 +30,7 @@ /// @cond INTERNAL_DOCS -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// @@ -269,7 +283,7 @@ namespace ARIASDK_NS_BEGIN }; -} ARIASDK_NS_END +} MAT_NS_END /// @endcond #endif diff --git a/lib/include/public/Variant.hpp b/lib/include/public/Variant.hpp index b63d36fa..966cc7f8 100644 --- a/lib/include/public/Variant.hpp +++ b/lib/include/public/Variant.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_VARIANT_HPP #define MAT_VARIANT_HPP @@ -35,7 +49,7 @@ public ref class VariantLockGuard { public: static Object ^ lock = gcnew Object( #endif #endif -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class Variant; @@ -59,6 +73,6 @@ namespace ARIASDK_NS_BEGIN // Shortcut for VariantArray constructor // const auto ARR = Variant::from_array; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/include/public/VariantType.hpp b/lib/include/public/VariantType.hpp index 43a3dc40..49a09a2e 100644 --- a/lib/include/public/VariantType.hpp +++ b/lib/include/public/VariantType.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_VARIANTTYPE_HPP #define MAT_VARIANTTYPE_HPP diff --git a/lib/include/public/Version.hpp b/lib/include/public/Version.hpp index 0655f24e..5776e89c 100644 --- a/lib/include/public/Version.hpp +++ b/lib/include/public/Version.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_VERSION_HPP #define MAT_VERSION_HPP // WARNING: DO NOT MODIFY THIS FILE! @@ -10,13 +24,13 @@ #include #ifdef HAVE_MAT_SHORT_NS -#define ARIASDK_NS_BEGIN MAT -#define ARIASDK_NS_END +#define MAT_NS_BEGIN MAT +#define MAT_NS_END #define PAL_NS_BEGIN PAL #define PAL_NS_END #else -#define ARIASDK_NS_BEGIN Microsoft { namespace Applications { namespace Events -#define ARIASDK_NS_END }} +#define MAT_NS_BEGIN Microsoft { namespace Applications { namespace Events +#define MAT_NS_END }} #define MAT ::Microsoft::Applications::Events #define PAL_NS_BEGIN Microsoft { namespace Applications { namespace Events { namespace PlatformAbstraction #define PAL_NS_END }}} @@ -25,7 +39,7 @@ #define MAT_v1 ::Microsoft::Applications::Telemetry -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { uint64_t const Version = ((uint64_t)3 << 48) | @@ -33,7 +47,7 @@ uint64_t const Version = ((uint64_t)216 << 16) | ((uint64_t)1); -} ARIASDK_NS_END +} MAT_NS_END namespace PAL_NS_BEGIN { } PAL_NS_END diff --git a/lib/include/public/Version.hpp.template b/lib/include/public/Version.hpp.template index de8fa3fc..2c1db319 100644 --- a/lib/include/public/Version.hpp.template +++ b/lib/include/public/Version.hpp.template @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef MAT_VERSION_HPP #define MAT_VERSION_HPP // WARNING: DO NOT MODIFY THIS FILE! @@ -10,13 +24,13 @@ #include #ifdef HAVE_MAT_SHORT_NS -#define ARIASDK_NS_BEGIN MAT -#define ARIASDK_NS_END +#define MAT_NS_BEGIN MAT +#define MAT_NS_END #define PAL_NS_BEGIN PAL #define PAL_NS_END #else -#define ARIASDK_NS_BEGIN Microsoft { namespace Applications { namespace Events -#define ARIASDK_NS_END }} +#define MAT_NS_BEGIN Microsoft { namespace Applications { namespace Events +#define MAT_NS_END }} #define MAT ::Microsoft::Applications::Events #define PAL_NS_BEGIN Microsoft { namespace Applications { namespace Events { namespace PlatformAbstraction #define PAL_NS_END }}} @@ -25,7 +39,7 @@ #define MAT_v1 ::Microsoft::Applications::Telemetry -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { uint64_t const Version = ((uint64_t)@BUILD_VERSION_MAJOR@ << 48) | @@ -33,7 +47,7 @@ uint64_t const Version = ((uint64_t)@BUILD_VERSION_PATCH@ << 16) | ((uint64_t)@BUILD_NUMBER@); -} ARIASDK_NS_END +} MAT_NS_END namespace PAL_NS_BEGIN { } PAL_NS_END diff --git a/lib/include/public/ctmacros.hpp b/lib/include/public/ctmacros.hpp index a8343b05..3d176bfd 100644 --- a/lib/include/public/ctmacros.hpp +++ b/lib/include/public/ctmacros.hpp @@ -1,4 +1,18 @@ -// Copyright (c) Microsoft. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// +// Copyright (c) 2020 Microsoft Corporation. All rights reserved. +// +// This code is licensed under the MIT License (MIT). +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +/////////////////////////////////////////////////////////////////////////////// #ifndef CTMACROS_HPP #define CTMACROS_HPP diff --git a/lib/include/public/mat.h b/lib/include/public/mat.h index 4533b172..919929aa 100644 --- a/lib/include/public/mat.h +++ b/lib/include/public/mat.h @@ -1,4 +1,18 @@ -/* Copyright (c) Microsoft. All rights reserved. */ +/* + + Copyright (c) 2020 Microsoft Corporation. All rights reserved. + + This code is licensed under the MIT License (MIT). + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +*/ #ifndef TELEMETRY_EVENTS_H #define TELEMETRY_EVENTS_H diff --git a/lib/jni/JniConvertors.cpp b/lib/jni/JniConvertors.cpp index 8e011898..2758861b 100644 --- a/lib/jni/JniConvertors.cpp +++ b/lib/jni/JniConvertors.cpp @@ -1,6 +1,6 @@ #include "JniConvertors.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { std::string JStringToStdString(JNIEnv* env, const jstring& jstr) { @@ -174,4 +174,4 @@ EventProperties GetEventProperties(JNIEnv* env, const jstring& jstrEventName, co return eventProperties; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/jni/JniConvertors.hpp b/lib/jni/JniConvertors.hpp index 9442e6d3..19656685 100644 --- a/lib/jni/JniConvertors.hpp +++ b/lib/jni/JniConvertors.hpp @@ -4,7 +4,7 @@ #define MAT_USE_WEAK_LOGMANAGER -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { struct UnsupportedEventPropertyType : std::exception { UnsupportedEventPropertyType(int type) { @@ -26,4 +26,4 @@ namespace ARIASDK_NS_BEGIN EventProperties GetEventProperties(JNIEnv*, const jstring&, const jstring&, const jint&, const jint&, const jdouble&, const jlong&, const jlong&, const jobjectArray&, const jobjectArray&); -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/jni/WrapperLogManager.hpp b/lib/jni/WrapperLogManager.hpp index a6e421de..d9ab6f1a 100644 --- a/lib/jni/WrapperLogManager.hpp +++ b/lib/jni/WrapperLogManager.hpp @@ -2,12 +2,12 @@ #define WRAPPERLOGMANAGER_HPP #include "LogManagerBase.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class WrapperConfig: public ILogConfiguration { }; class WrapperLogManager: public LogManagerBase { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/offline/ClockSkewManager.hpp b/lib/offline/ClockSkewManager.hpp index b48eaf32..b9fcd427 100644 --- a/lib/offline/ClockSkewManager.hpp +++ b/lib/offline/ClockSkewManager.hpp @@ -6,7 +6,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class ClockSkewManager { @@ -89,5 +89,5 @@ namespace ARIASDK_NS_BEGIN { int64_t m_pingSendTime {}; }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/offline/ISqlite3Proxy.hpp b/lib/offline/ISqlite3Proxy.hpp index 9cffb421..433380f4 100644 --- a/lib/offline/ISqlite3Proxy.hpp +++ b/lib/offline/ISqlite3Proxy.hpp @@ -13,7 +13,7 @@ struct sqlite3_stmt; struct sqlite3_vfs; -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class ISqlite3Proxy { @@ -57,5 +57,5 @@ class ISqlite3Proxy { extern ISqlite3Proxy* g_sqlite3Proxy; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/offline/KillSwitchManager.hpp b/lib/offline/KillSwitchManager.hpp index d23a26c4..1663a879 100644 --- a/lib/offline/KillSwitchManager.hpp +++ b/lib/offline/KillSwitchManager.hpp @@ -10,7 +10,7 @@ #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class KillSwitchManager { @@ -159,5 +159,5 @@ namespace ARIASDK_NS_BEGIN { int64_t m_retryAfterExpiryTime; }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/offline/MemoryStorage.cpp b/lib/offline/MemoryStorage.cpp index 29c08ac1..7b3a81b7 100644 --- a/lib/offline/MemoryStorage.cpp +++ b/lib/offline/MemoryStorage.cpp @@ -3,7 +3,7 @@ #include "utils/Utils.hpp" #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { MATSDK_LOG_INST_COMPONENT_CLASS(MemoryStorage, "EventsSDK.MemoryStorage", "Events telemetry client - MemoryStorage class"); @@ -483,4 +483,4 @@ namespace ARIASDK_NS_BEGIN { return m_reserved_records.size(); } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/offline/MemoryStorage.hpp b/lib/offline/MemoryStorage.hpp index a927918e..0a30008d 100644 --- a/lib/offline/MemoryStorage.hpp +++ b/lib/offline/MemoryStorage.hpp @@ -18,7 +18,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class MemoryStorage : public IOfflineStorage { @@ -92,5 +92,5 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/offline/OfflineStorageHandler.cpp b/lib/offline/OfflineStorageHandler.cpp index acaa8e88..d96be041 100644 --- a/lib/offline/OfflineStorageHandler.cpp +++ b/lib/offline/OfflineStorageHandler.cpp @@ -17,7 +17,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { MATSDK_LOG_INST_COMPONENT_CLASS(OfflineStorageHandler, "EventsSDK.StorageHandler", "Events telemetry client - OfflineStorageHandler class"); @@ -526,4 +526,4 @@ namespace ARIASDK_NS_BEGIN { m_observer->OnStorageRecordsSaved(numRecords); } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/offline/OfflineStorageHandler.hpp b/lib/offline/OfflineStorageHandler.hpp index 6eaa81a6..79927661 100644 --- a/lib/offline/OfflineStorageHandler.hpp +++ b/lib/offline/OfflineStorageHandler.hpp @@ -16,7 +16,7 @@ #include "KillSwitchManager.hpp" #include "ClockSkewManager.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class OfflineStorageHandler : public IOfflineStorage, public IOfflineStorageObserver { @@ -92,4 +92,4 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/offline/OfflineStorage_Room.cpp b/lib/offline/OfflineStorage_Room.cpp index 81e358a4..82e02c5d 100644 --- a/lib/offline/OfflineStorage_Room.cpp +++ b/lib/offline/OfflineStorage_Room.cpp @@ -3,7 +3,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /** * Java virtual machine @@ -1022,7 +1022,7 @@ namespace ARIASDK_NS_BEGIN MATSDK_LOG_INST_COMPONENT_CLASS(OfflineStorage_Room, "EventsSDK.RoomStorage", "Offline Storage: Android Room database") } -ARIASDK_NS_END +MAT_NS_END extern "C" JNIEXPORT void JNICALL Java_com_microsoft_applications_events_OfflineRoom_connectContext( diff --git a/lib/offline/OfflineStorage_Room.hpp b/lib/offline/OfflineStorage_Room.hpp index 2792e302..0f618697 100644 --- a/lib/offline/OfflineStorage_Room.hpp +++ b/lib/offline/OfflineStorage_Room.hpp @@ -18,7 +18,7 @@ #define ENABLE_LOCKING // Enable DB locking for flush -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class OfflineStorage_Room : public IOfflineStorage { @@ -111,5 +111,5 @@ namespace ARIASDK_NS_BEGIN }; } -ARIASDK_NS_END +MAT_NS_END #endif diff --git a/lib/offline/OfflineStorage_SQLite.cpp b/lib/offline/OfflineStorage_SQLite.cpp index e2150083..d1815ffb 100644 --- a/lib/offline/OfflineStorage_SQLite.cpp +++ b/lib/offline/OfflineStorage_SQLite.cpp @@ -10,7 +10,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { constexpr static size_t kBlockSize = 8192; @@ -940,5 +940,5 @@ namespace ARIASDK_NS_BEGIN { return result; } -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/offline/OfflineStorage_SQLite.hpp b/lib/offline/OfflineStorage_SQLite.hpp index 2a1ec55a..7f7e4192 100644 --- a/lib/offline/OfflineStorage_SQLite.hpp +++ b/lib/offline/OfflineStorage_SQLite.hpp @@ -16,7 +16,7 @@ #define ENABLE_LOCKING // Enable DB locking for flush -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class SqliteDB; @@ -114,5 +114,5 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/offline/SQLiteWrapper.hpp b/lib/offline/SQLiteWrapper.hpp index aa40691a..d7e651f7 100644 --- a/lib/offline/SQLiteWrapper.hpp +++ b/lib/offline/SQLiteWrapper.hpp @@ -13,7 +13,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { using SQLRecord = std::vector; using SQLRecords = std::vector; @@ -765,5 +765,5 @@ namespace ARIASDK_NS_BEGIN { MATSDK_LOG_INST_COMPONENT_CLASS(SqliteStatement, "EventsSDK.SQLiteStatement", "Events telemetry client - Sqlite statement class"); -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/offline/StorageObserver.cpp b/lib/offline/StorageObserver.cpp index 9decf0ad..fa4e261d 100644 --- a/lib/offline/StorageObserver.cpp +++ b/lib/offline/StorageObserver.cpp @@ -2,7 +2,7 @@ #include "StorageObserver.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { StorageObserver::StorageObserver(ITelemetrySystem& system, IOfflineStorage& offlineStorage) : @@ -211,4 +211,4 @@ namespace ARIASDK_NS_BEGIN { DispatchEvent(evt); } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/offline/StorageObserver.hpp b/lib/offline/StorageObserver.hpp index 466bc436..ee574dd3 100644 --- a/lib/offline/StorageObserver.hpp +++ b/lib/offline/StorageObserver.hpp @@ -8,7 +8,7 @@ #include "system/Route.hpp" #include "system/ITelemetrySystem.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class StorageObserver : public IOfflineStorageObserver, @@ -82,5 +82,5 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/packager/BondSplicer.cpp b/lib/packager/BondSplicer.cpp index 5c37335e..f756804a 100644 --- a/lib/packager/BondSplicer.cpp +++ b/lib/packager/BondSplicer.cpp @@ -5,7 +5,7 @@ #include "bond/generated/CsProtocol_writers.hpp" #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { size_t BondSplicer::addTenantToken(std::string const& tenantToken) { @@ -58,4 +58,4 @@ void BondSplicer::clear() } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/packager/BondSplicer.hpp b/lib/packager/BondSplicer.hpp index 1276a380..f19b1574 100644 --- a/lib/packager/BondSplicer.hpp +++ b/lib/packager/BondSplicer.hpp @@ -8,7 +8,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class BondSplicer @@ -44,5 +44,5 @@ class BondSplicer }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/packager/DataPackage.hpp b/lib/packager/DataPackage.hpp index 5e39fea9..b24db25d 100644 --- a/lib/packager/DataPackage.hpp +++ b/lib/packager/DataPackage.hpp @@ -3,7 +3,7 @@ #pragma once #include "CsProtocol_types.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { struct DataPackage { @@ -43,4 +43,4 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/packager/Packager.cpp b/lib/packager/Packager.cpp index 03810741..4f58e6d4 100644 --- a/lib/packager/Packager.cpp +++ b/lib/packager/Packager.cpp @@ -5,7 +5,7 @@ #include "utils/Utils.hpp" #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { Packager::Packager(IRuntimeConfig& runtimeConfig) : m_config(runtimeConfig) @@ -78,4 +78,4 @@ namespace ARIASDK_NS_BEGIN { } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/packager/Packager.hpp b/lib/packager/Packager.hpp index 0c8ffe0f..c1d4181b 100644 --- a/lib/packager/Packager.hpp +++ b/lib/packager/Packager.hpp @@ -6,7 +6,7 @@ #include "system/Route.hpp" #include "system/Contexts.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class Packager { public: @@ -29,4 +29,4 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/pal/PAL.hpp b/lib/pal/PAL.hpp index fafee1d7..9a0f2270 100644 --- a/lib/pal/PAL.hpp +++ b/lib/pal/PAL.hpp @@ -57,10 +57,10 @@ #include "typename.hpp" #include "WorkerThread.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { void print_backtrace(); -} ARIASDK_NS_END +} MAT_NS_END namespace PAL_NS_BEGIN { diff --git a/lib/pal/desktop/NetworkDetector.cpp b/lib/pal/desktop/NetworkDetector.cpp index 9dbf7af5..08c55cab 100644 --- a/lib/pal/desktop/NetworkDetector.cpp +++ b/lib/pal/desktop/NetworkDetector.cpp @@ -26,7 +26,7 @@ DEFINE_GUID(IID_INetworkCostManager2, 0xdcb00008, 0x570f, 0x4a9b, 0x8d, 0x69, 0x #define NETDETECTOR_COM_SETTLE_MS 1000 -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { namespace Windows { @@ -703,6 +703,6 @@ namespace ARIASDK_NS_BEGIN } // ::Windows -} ARIASDK_NS_END +} MAT_NS_END #endif \ No newline at end of file diff --git a/lib/pal/desktop/NetworkDetector.hpp b/lib/pal/desktop/NetworkDetector.hpp index b24e7e23..5b4e1dbe 100644 --- a/lib/pal/desktop/NetworkDetector.hpp +++ b/lib/pal/desktop/NetworkDetector.hpp @@ -62,7 +62,7 @@ using namespace ABI::Windows::Networking::Connectivity; using namespace std; -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { namespace Windows { @@ -272,7 +272,7 @@ namespace ARIASDK_NS_BEGIN }; } -} ARIASDK_NS_END +} MAT_NS_END namespace MATW = MAT::Windows; diff --git a/lib/pal/desktop/WindowsEnvironmentInfo.hpp b/lib/pal/desktop/WindowsEnvironmentInfo.hpp index ead5f9f9..a909897f 100644 --- a/lib/pal/desktop/WindowsEnvironmentInfo.hpp +++ b/lib/pal/desktop/WindowsEnvironmentInfo.hpp @@ -6,7 +6,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class WindowsEnvironmentInfo { @@ -61,5 +61,5 @@ namespace ARIASDK_NS_BEGIN { } }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/shared/LogManagerCX.cpp b/lib/shared/LogManagerCX.cpp index b64836c2..5d313af6 100644 --- a/lib/shared/LogManagerCX.cpp +++ b/lib/shared/LogManagerCX.cpp @@ -19,7 +19,7 @@ #include "LogManager.hpp" -namespace ARIASDK_NS_BEGIN { DEFINE_LOGMANAGER(LogManager, ModuleLogConfiguration); } ARIASDK_NS_END +namespace MAT_NS_BEGIN { DEFINE_LOGMANAGER(LogManager, ModuleLogConfiguration); } MAT_NS_END namespace MATW_NS_BEGIN { diff --git a/lib/shared/PlatformHelpers.h b/lib/shared/PlatformHelpers.h index 166e94e8..bbafab00 100644 --- a/lib/shared/PlatformHelpers.h +++ b/lib/shared/PlatformHelpers.h @@ -65,14 +65,14 @@ typedef IDictionary EditableMeasurementMap; using namespace std; -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class EventProperties; class ILogger; class LogManager; class ISemanticContext; class LogConfiguration; struct EventProperty; -} ARIASDK_NS_END; +} MAT_NS_END; namespace Microsoft { namespace Applications { diff --git a/lib/stats/MetaStats.cpp b/lib/stats/MetaStats.cpp index f0e22d3f..80e9ba16 100644 --- a/lib/stats/MetaStats.cpp +++ b/lib/stats/MetaStats.cpp @@ -4,7 +4,7 @@ #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { /// /// Lock metaStats counts when rejected events come in via a separate thread @@ -626,4 +626,4 @@ namespace ARIASDK_NS_BEGIN { MATSDK_LOG_INST_COMPONENT_CLASS(RecordStats, "EventsSDK.RecordStats", "RecordStats"); -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/stats/MetaStats.hpp b/lib/stats/MetaStats.hpp index c7ee4fcc..df50f373 100644 --- a/lib/stats/MetaStats.hpp +++ b/lib/stats/MetaStats.hpp @@ -11,7 +11,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { /** \brief The first positive spot for the frequency distribution of package consecutive failure duration. <20s, 20s~40s, 40s~80s, 80s~160s, 160s~320s, 320s~640s, >640s @@ -608,6 +608,6 @@ namespace ARIASDK_NS_BEGIN { void snapStatsToRecord(std::vector< ::CsProtocol::Record>& records, RollUpKind rollupKind, TelemetryStats& telemetryStats); }; -} ARIASDK_NS_END +} MAT_NS_END #endif \ No newline at end of file diff --git a/lib/stats/Statistics.cpp b/lib/stats/Statistics.cpp index 83caffad..fed32de7 100644 --- a/lib/stats/Statistics.cpp +++ b/lib/stats/Statistics.cpp @@ -7,7 +7,7 @@ #include "utils/Utils.hpp" #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { Statistics::Statistics(ITelemetrySystem& telemetrySystem, ITaskDispatcher& taskDispatcher) : m_metaStats(telemetrySystem.getConfig()), @@ -269,4 +269,4 @@ namespace ARIASDK_NS_BEGIN { return true; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/stats/Statistics.hpp b/lib/stats/Statistics.hpp index 9ef80abf..37144ad8 100644 --- a/lib/stats/Statistics.hpp +++ b/lib/stats/Statistics.hpp @@ -18,7 +18,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class ITelemetrySystem; class DebugEventListener; @@ -123,6 +123,6 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/system/ClockSkewDelta.h b/lib/system/ClockSkewDelta.h index c34b295f..b056b9ea 100644 --- a/lib/system/ClockSkewDelta.h +++ b/lib/system/ClockSkewDelta.h @@ -4,7 +4,7 @@ #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class ClockSkewDelta @@ -89,5 +89,5 @@ namespace ARIASDK_NS_BEGIN { } }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/system/Contexts.hpp b/lib/system/Contexts.hpp index 714c78b1..eba46ece 100644 --- a/lib/system/Contexts.hpp +++ b/lib/system/Contexts.hpp @@ -12,7 +12,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class IncomingEventContext { @@ -128,4 +128,4 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/system/EventProperties.cpp b/lib/system/EventProperties.cpp index 9a13267a..fcea7c84 100644 --- a/lib/system/EventProperties.cpp +++ b/lib/system/EventProperties.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace MAT; -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { const char* const DefaultEventName = "undefined"; @@ -422,7 +422,6 @@ namespace ARIASDK_NS_BEGIN { break; case TYPE_GUID: lhs.value.as_guid = new evt_guid_t(); - // TODO: copy from GUID_t to aria_guid_t break; #if 0 case TYPE_STRING_ARRAY: @@ -580,5 +579,5 @@ namespace ARIASDK_NS_BEGIN { } #endif /* end of MAT_C_API */ -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/system/EventPropertiesStorage.hpp b/lib/system/EventPropertiesStorage.hpp index efda7dc3..0ba1e476 100644 --- a/lib/system/EventPropertiesStorage.hpp +++ b/lib/system/EventPropertiesStorage.hpp @@ -8,7 +8,7 @@ #include "ctmacros.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { struct EventPropertiesStorage { @@ -67,4 +67,4 @@ namespace ARIASDK_NS_BEGIN { } }; -} ARIASDK_NS_END \ No newline at end of file +} MAT_NS_END \ No newline at end of file diff --git a/lib/system/EventProperty.cpp b/lib/system/EventProperty.cpp index dd42cb96..71e5321a 100644 --- a/lib/system/EventProperty.cpp +++ b/lib/system/EventProperty.cpp @@ -20,7 +20,7 @@ using namespace MAT; #define _strdup strdup #endif -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { // TODO: [MG] - time_ticks_t would benefit from an extra method: // time_ticks_t::time_ticks_t(const std::time_t time) @@ -886,4 +886,4 @@ namespace ARIASDK_NS_BEGIN { return result; } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/system/ITelemetrySystem.hpp b/lib/system/ITelemetrySystem.hpp index f6e0fb30..1161784c 100644 --- a/lib/system/ITelemetrySystem.hpp +++ b/lib/system/ITelemetrySystem.hpp @@ -10,7 +10,7 @@ #include "api/IRuntimeConfig.hpp" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class DebugEventDispatcher; @@ -49,6 +49,6 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/system/JsonFormatter.cpp b/lib/system/JsonFormatter.cpp index fbd681fa..0d03c90a 100644 --- a/lib/system/JsonFormatter.cpp +++ b/lib/system/JsonFormatter.cpp @@ -4,7 +4,7 @@ using json = nlohmann::json; -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { JsonFormatter::JsonFormatter() @@ -185,4 +185,4 @@ namespace ARIASDK_NS_BEGIN return ans.dump(4); } -} ARIASDK_NS_END \ No newline at end of file +} MAT_NS_END \ No newline at end of file diff --git a/lib/system/JsonFormatter.hpp b/lib/system/JsonFormatter.hpp index 4cea3333..4b84251c 100644 --- a/lib/system/JsonFormatter.hpp +++ b/lib/system/JsonFormatter.hpp @@ -4,15 +4,8 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { - const char* const ARIA_EXT_TEXT = "ext"; - const char* const ARIA_DATA_TEXT = "data"; - const char* const ARIA_EXT_EXTAPP_TEXT = "extApp"; - const char* const ARIA_EXT_EXTOS_TEXT = "os"; - const char* const ARIA_EXT_EXTNET_TEXT = "extNet"; - const char* const ARIA_EXT_EXTMETADATA_TEXT = "metadata"; - class MATSDK_LIBABI JsonFormatter { public: @@ -23,4 +16,4 @@ namespace ARIASDK_NS_BEGIN std::string getJsonFormattedEvent(IncomingEventContextPtr const& event); }; -} ARIASDK_NS_END \ No newline at end of file +} MAT_NS_END \ No newline at end of file diff --git a/lib/system/Route.hpp b/lib/system/Route.hpp index 780ca0b0..b4ae1837 100644 --- a/lib/system/Route.hpp +++ b/lib/system/Route.hpp @@ -7,7 +7,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { //! Interface for generic route sink (incoming data handler) template @@ -183,5 +183,5 @@ namespace ARIASDK_NS_BEGIN { std::vector*> m_passthroughs; }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/system/TelemetrySystem.cpp b/lib/system/TelemetrySystem.cpp index b5d2e7e2..58172ed9 100644 --- a/lib/system/TelemetrySystem.cpp +++ b/lib/system/TelemetrySystem.cpp @@ -6,7 +6,7 @@ #include "mat/config.h" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { /// /// Initializes a new instance of the class. @@ -219,4 +219,4 @@ namespace ARIASDK_NS_BEGIN { signalDone(); } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/system/TelemetrySystem.hpp b/lib/system/TelemetrySystem.hpp index f304e759..4bb0b20f 100644 --- a/lib/system/TelemetrySystem.hpp +++ b/lib/system/TelemetrySystem.hpp @@ -25,7 +25,7 @@ #include "tpm/TransmissionPolicyManager.hpp" #include "ClockSkewDelta.h" -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class NullCompression { @@ -75,4 +75,4 @@ namespace ARIASDK_NS_BEGIN { RouteSink incomingEventPrepared{ this, &TelemetrySystem::handleIncomingEventPrepared }; }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/system/TelemetrySystemBase.hpp b/lib/system/TelemetrySystemBase.hpp index aa61c14a..bb7334a4 100644 --- a/lib/system/TelemetrySystemBase.hpp +++ b/lib/system/TelemetrySystemBase.hpp @@ -7,7 +7,7 @@ #include "stats/Statistics.hpp" #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { // typedef std::function StateHandler; @@ -176,6 +176,6 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/tpm/DeviceStateHandler.cpp b/lib/tpm/DeviceStateHandler.cpp index c71820c6..5816ec1d 100644 --- a/lib/tpm/DeviceStateHandler.cpp +++ b/lib/tpm/DeviceStateHandler.cpp @@ -8,7 +8,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { using namespace std; using namespace PAL; @@ -142,4 +142,4 @@ void DeviceStateHandler::OnChanged( //do we need to stop current timer?? and restart } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/tpm/DeviceStateHandler.hpp b/lib/tpm/DeviceStateHandler.hpp index 1f26a566..672d2b40 100644 --- a/lib/tpm/DeviceStateHandler.hpp +++ b/lib/tpm/DeviceStateHandler.hpp @@ -11,7 +11,7 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class DeviceStateHandler : public PAL::IPropertyChangedCallback @@ -42,6 +42,6 @@ private: }; -} ARIASDK_NS_END +} MAT_NS_END #endif // DEVICESTATEHANDLER_HPP diff --git a/lib/tpm/TransmissionPolicyManager.cpp b/lib/tpm/TransmissionPolicyManager.cpp index a955a4ba..c39648ab 100644 --- a/lib/tpm/TransmissionPolicyManager.cpp +++ b/lib/tpm/TransmissionPolicyManager.cpp @@ -8,7 +8,7 @@ #define ABS64(a,b) ((a>b)?(a-b):(b-a)) -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { int const DEFAULT_DELAY_SEND_HTTP = 2 * 1000; // 2 sec @@ -370,4 +370,4 @@ namespace ARIASDK_NS_BEGIN { } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/tpm/TransmissionPolicyManager.hpp b/lib/tpm/TransmissionPolicyManager.hpp index d9ec5838..ef8f2638 100644 --- a/lib/tpm/TransmissionPolicyManager.hpp +++ b/lib/tpm/TransmissionPolicyManager.hpp @@ -28,7 +28,7 @@ #define UPLOAD_TASK_CANCEL_TIME_MS 500 #endif -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { class TransmissionPolicyManager { @@ -186,4 +186,4 @@ namespace ARIASDK_NS_BEGIN { }; -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/tpm/TransmitProfiles.cpp b/lib/tpm/TransmitProfiles.cpp index f3f98be8..e778a856 100644 --- a/lib/tpm/TransmitProfiles.cpp +++ b/lib/tpm/TransmitProfiles.cpp @@ -55,7 +55,7 @@ static void initTransmitProfileFields() #define LOCK_PROFILES std::lock_guard lock(profiles_mtx) -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { static const char* ATTR_NAME = "name"; /// name attribute @@ -575,7 +575,7 @@ namespace ARIASDK_NS_BEGIN { // Make sure we populate transmitProfileFields dynamically before start static TransmitProfiles __profiles; -} ARIASDK_NS_END +} MAT_NS_END #else #include "TransmitProfilesStub.hpp" diff --git a/lib/tpm/TransmitProfilesStub.hpp b/lib/tpm/TransmitProfilesStub.hpp index 514dc615..f94a11ef 100644 --- a/lib/tpm/TransmitProfilesStub.hpp +++ b/lib/tpm/TransmitProfilesStub.hpp @@ -3,7 +3,7 @@ #define TRANSMITPROFILESSTUB_HPP #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { TransmitProfiles::TransmitProfiles() {}; @@ -31,6 +31,6 @@ namespace ARIASDK_NS_BEGIN { bool TransmitProfiles::isTimerUpdateRequired() { return false; } -} ARIASDK_NS_END +} MAT_NS_END #endif // TRANSMITPROFILESSTUB_HPP diff --git a/lib/utils/FileUtils.cpp b/lib/utils/FileUtils.cpp index 3a88dbaf..6ef2acc5 100644 --- a/lib/utils/FileUtils.cpp +++ b/lib/utils/FileUtils.cpp @@ -6,7 +6,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /** @@ -166,4 +166,4 @@ namespace ARIASDK_NS_BEGIN #endif } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/utils/FileUtils.hpp b/lib/utils/FileUtils.hpp index 0ee7ba15..01fa8419 100644 --- a/lib/utils/FileUtils.hpp +++ b/lib/utils/FileUtils.hpp @@ -6,7 +6,7 @@ #include "Version.hpp" #include "pal/PAL.hpp" -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { size_t FileGetSize(const char* filename); int FileDelete(const char* filename); @@ -16,6 +16,6 @@ namespace ARIASDK_NS_BEGIN bool FileWrite(const char* filename, const char* contents); bool FileExists(const char* name); -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/utils/StringConversion.cpp b/lib/utils/StringConversion.cpp index 373ba8f1..c974644d 100644 --- a/lib/utils/StringConversion.cpp +++ b/lib/utils/StringConversion.cpp @@ -4,7 +4,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /** \brief Convert UTF-8 to UTF-16 */ @@ -22,4 +22,4 @@ namespace ARIASDK_NS_BEGIN return converter.to_bytes(in); } } -ARIASDK_NS_END +MAT_NS_END diff --git a/lib/utils/StringConversion.hpp b/lib/utils/StringConversion.hpp index 88e09fb9..972e0e71 100644 --- a/lib/utils/StringConversion.hpp +++ b/lib/utils/StringConversion.hpp @@ -6,12 +6,12 @@ #include "ctmacros.hpp" #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { std::wstring to_utf16_string(const std::string& in); std::string to_utf8_string(const std::wstring& in); -} ARIASDK_NS_END +} MAT_NS_END #endif \ No newline at end of file diff --git a/lib/utils/StringMatcher.hpp b/lib/utils/StringMatcher.hpp index 75e2f4b3..ed7ac5ed 100644 --- a/lib/utils/StringMatcher.hpp +++ b/lib/utils/StringMatcher.hpp @@ -2,7 +2,7 @@ #ifndef STRINGMATCHER_HPP #define STRINGMATCHER_HPP -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { /// /// Simple class to cheaply manage string matches. Note that we currently @@ -121,5 +121,5 @@ namespace ARIASDK_NS_BEGIN } }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/utils/StringUtils.cpp b/lib/utils/StringUtils.cpp index 1d772d64..d95acda9 100644 --- a/lib/utils/StringUtils.cpp +++ b/lib/utils/StringUtils.cpp @@ -3,7 +3,7 @@ using std::string; using std::vector; -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { void StringUtils::SplitString(const string& s, const char separator, vector& parts) { @@ -32,4 +32,4 @@ namespace ARIASDK_NS_BEGIN return (stringToTest.find_first_not_of(whitelist) == string::npos); } -} ARIASDK_NS_END \ No newline at end of file +} MAT_NS_END \ No newline at end of file diff --git a/lib/utils/StringUtils.hpp b/lib/utils/StringUtils.hpp index 3438d16e..5527440e 100644 --- a/lib/utils/StringUtils.hpp +++ b/lib/utils/StringUtils.hpp @@ -8,7 +8,7 @@ #include #include -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class StringUtils { @@ -23,5 +23,5 @@ namespace ARIASDK_NS_BEGIN StringUtils& operator=(const StringUtils&) = delete; }; -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/lib/utils/Utils.cpp b/lib/utils/Utils.cpp index f67144cc..1bfa6e13 100644 --- a/lib/utils/Utils.cpp +++ b/lib/utils/Utils.cpp @@ -31,11 +31,11 @@ #include #include -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { MATSDK_LOG_INST_COMPONENT_NS("MATSDK", "MS App Telemetry client"); -} ARIASDK_NS_END +} MAT_NS_END -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { void sleep(unsigned delayMs) { @@ -323,4 +323,4 @@ namespace ARIASDK_NS_BEGIN { return (unsigned)(!str[h] ? 5381 : ((unsigned long long)hashCode(str, h + 1) * (unsigned)33) ^ str[h]); } -} ARIASDK_NS_END +} MAT_NS_END diff --git a/lib/utils/Utils.hpp b/lib/utils/Utils.hpp index 33826b55..1e78867c 100644 --- a/lib/utils/Utils.hpp +++ b/lib/utils/Utils.hpp @@ -50,7 +50,7 @@ namespace std #define EFAIL -1 #endif -namespace ARIASDK_NS_BEGIN { +namespace MAT_NS_BEGIN { const char* getMATSDKLogComponent(); @@ -198,6 +198,6 @@ namespace ARIASDK_NS_BEGIN { unsigned hashCode(const char* str, int h = 0); -} ARIASDK_NS_END +} MAT_NS_END #endif diff --git a/tests/functests/BasicFuncTests.cpp b/tests/functests/BasicFuncTests.cpp index b296f064..0fc6a436 100644 --- a/tests/functests/BasicFuncTests.cpp +++ b/tests/functests/BasicFuncTests.cpp @@ -67,7 +67,7 @@ namespace PAL_NS_BEGIN } PAL_NS_END; -namespace ARIASDK_NS_BEGIN +namespace MAT_NS_BEGIN { class ModuleA : public ILogConfiguration { @@ -85,7 +85,7 @@ namespace ARIASDK_NS_BEGIN DEFINE_LOGMANAGER(LogManagerB, ModuleB); DEFINE_LOGMANAGER(LogManagerA, ModuleA); } -ARIASDK_NS_END +MAT_NS_END char const* const TEST_STORAGE_FILENAME = "BasicFuncTests.db";