From bcbf30de3f183c5867d94e645a2d5b17b89a5f83 Mon Sep 17 00:00:00 2001 From: Andrei Dabija Date: Mon, 16 Jun 2025 15:38:28 +0300 Subject: [PATCH 1/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 04a2cb97..fddbfb38 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Example: Example: ``` c++ - gameanalytics::GameAnalytics::initialize("", "", ""); ``` ### Send events From 1e493db04ed04bffc747a3ab0f306b71b92a5b2f Mon Sep 17 00:00:00 2001 From: Andrei Dabija Date: Fri, 20 Jun 2025 10:40:28 +0300 Subject: [PATCH 2/3] create internal compression component --- source/dependencies/miniz/{miniz.c => GA_Zip.cpp} | 0 source/gameanalytics/GAUtilities.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename source/dependencies/miniz/{miniz.c => GA_Zip.cpp} (100%) diff --git a/source/dependencies/miniz/miniz.c b/source/dependencies/miniz/GA_Zip.cpp similarity index 100% rename from source/dependencies/miniz/miniz.c rename to source/dependencies/miniz/GA_Zip.cpp diff --git a/source/gameanalytics/GAUtilities.cpp b/source/gameanalytics/GAUtilities.cpp index bbb1807c..d73e9bed 100644 --- a/source/gameanalytics/GAUtilities.cpp +++ b/source/gameanalytics/GAUtilities.cpp @@ -20,7 +20,7 @@ // From crypto #define MINIZ_HEADER_FILE_ONLY -#include "miniz.c" +#include "GA_Zip.h" namespace gameanalytics { From 6531a57db6ea220d009f8372b12cf81ea64e848c Mon Sep 17 00:00:00 2001 From: Andrei Dabija Date: Fri, 20 Jun 2025 11:06:15 +0300 Subject: [PATCH 3/3] use the new miniz code --- source/dependencies/miniz/GA_Zip.cpp | 22 +++++++--------------- source/gameanalytics/GAUtilities.cpp | 4 +++- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/source/dependencies/miniz/GA_Zip.cpp b/source/dependencies/miniz/GA_Zip.cpp index 2b787fbf..31f5841f 100644 --- a/source/dependencies/miniz/GA_Zip.cpp +++ b/source/dependencies/miniz/GA_Zip.cpp @@ -219,9 +219,9 @@ #define MINIZ_HAS_64BIT_REGISTERS 1 #endif -#ifdef __cplusplus -extern "C" { -#endif +namespace gameanalytics { +namespace utilities { +namespace zip { // ------------------- zlib-style API Definitions. @@ -919,10 +919,6 @@ mz_uint32 tdefl_get_adler32(tdefl_compressor *d); mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy); #endif // #ifndef MINIZ_NO_ZLIB_APIS -#ifdef __cplusplus -} -#endif - #endif // MINIZ_HEADER_INCLUDED // ------------------- End of Header: Implementation follows. (If you only want the header, define MINIZ_HEADER_FILE_ONLY.) @@ -968,10 +964,6 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64)==8 ? 1 : -1]; #define MZ_FORCEINLINE inline #endif -#ifdef __cplusplus - extern "C" { -#endif - // ------------------- zlib-style API's mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len) @@ -4882,12 +4874,12 @@ void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char #endif // #ifndef MINIZ_NO_ARCHIVE_APIS -#ifdef __cplusplus -} -#endif - #endif // MINIZ_HEADER_FILE_ONLY +} // namespace zip +} // namespace utilities +} // namespace gameanalytics + /* This is free and unencumbered software released into the public domain. diff --git a/source/gameanalytics/GAUtilities.cpp b/source/gameanalytics/GAUtilities.cpp index d73e9bed..2f98626e 100644 --- a/source/gameanalytics/GAUtilities.cpp +++ b/source/gameanalytics/GAUtilities.cpp @@ -20,12 +20,14 @@ // From crypto #define MINIZ_HEADER_FILE_ONLY -#include "GA_Zip.h" +#include "GA_Zip.cpp" namespace gameanalytics { namespace utilities { + using namespace zip; + std::string printArray(StringVector const& v, std::string const& delim) { if(v.empty())