diff options
| author | mikhnenko <mikhnenko@yandex-team.com> | 2025-01-31 07:22:37 +0300 |
|---|---|---|
| committer | mikhnenko <mikhnenko@yandex-team.com> | 2025-01-31 07:40:36 +0300 |
| commit | 8fd0148e3c70e7613150e2e9f542f059735beea2 (patch) | |
| tree | 5d093ce36e4de43b852fb1aaa9bd70c87c223a4e | |
| parent | 73d35327ad05f0f37dda320ec4ea63b8f57ec8fd (diff) | |
| download | ydb-8fd0148e3c70e7613150e2e9f542f059735beea2.tar.gz | |
Move include from namespace
commit_hash:4cd737269b19eab384e9de53bdc2e4bec6c8a7d3
| -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 ee10f0225d1..c337f342a0e 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 00000000000..807b008f399 --- /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 + { |