diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2025-02-01 00:51:40 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2025-02-01 00:51:40 +0000 |
| commit | bc8b47be9c7f60e7194d1e834f4d57ee1b830d52 (patch) | |
| tree | ef2e54f1b2e1fad9870b3df17f6ffaaa402a1637 /contrib/restricted/aws/aws-crt-cpp | |
| parent | 28b42072a94e399b79032d7197a0e9c170e2cff0 (diff) | |
| parent | 6bdb8392267259f3f148458ab5946e2654631bfc (diff) | |
| download | ydb-bc8b47be9c7f60e7194d1e834f4d57ee1b830d52.tar.gz | |
Merge branch 'rightlib' into merge-libs-250201-0050
Diffstat (limited to 'contrib/restricted/aws/aws-crt-cpp')
| -rw-r--r-- | contrib/restricted/aws/aws-crt-cpp/include/aws/crt/external/cJSON.h | 4 | ||||
| -rw-r--r-- | contrib/restricted/aws/aws-crt-cpp/patches/01-move-include-from-namespace.patch | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/contrib/restricted/aws/aws-crt-cpp/include/aws/crt/external/cJSON.h b/contrib/restricted/aws/aws-crt-cpp/include/aws/crt/external/cJSON.h index ee10f0225d..c337f342a0 100644 --- a/contrib/restricted/aws/aws-crt-cpp/include/aws/crt/external/cJSON.h +++ b/contrib/restricted/aws/aws-crt-cpp/include/aws/crt/external/cJSON.h @@ -44,8 +44,6 @@ #ifndef cJSON__h #define cJSON__h -namespace Aws { - #if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32)) #define __WINDOWS__ #endif @@ -117,6 +115,8 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ #define cJSON_IsReference 256 #define cJSON_StringIsConst 512 +namespace Aws { + /* The cJSON structure: */ typedef struct cJSON { diff --git a/contrib/restricted/aws/aws-crt-cpp/patches/01-move-include-from-namespace.patch b/contrib/restricted/aws/aws-crt-cpp/patches/01-move-include-from-namespace.patch new file mode 100644 index 0000000000..807b008f39 --- /dev/null +++ b/contrib/restricted/aws/aws-crt-cpp/patches/01-move-include-from-namespace.patch @@ -0,0 +1,20 @@ +--- contrib/restricted/aws/aws-crt-cpp/include/aws/crt/external/cJSON.h (f680f339877c3c3539c85345ee15f023012893c9) ++++ contrib/restricted/aws/aws-crt-cpp/include/aws/crt/external/cJSON.h (working tree) +@@ -44,8 +44,6 @@ + #ifndef cJSON__h + #define cJSON__h + +-namespace Aws { +- + #if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32)) + #define __WINDOWS__ + #endif +@@ -117,6 +115,8 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ + #define cJSON_IsReference 256 + #define cJSON_StringIsConst 512 + ++namespace Aws { ++ + /* The cJSON structure: */ + typedef struct cJSON + { |