diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-29 08:04:45 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-30 10:17:13 -0400 |
| commit | c103a959d12e810bb3eb8a8f155a171944d6a1ea (patch) | |
| tree | aad0eda935833af129f23f48c9ac412bb96ac2b2 /Utilities/cmjsoncpp | |
| parent | 0a0f71066f5206898ab8da789c04b17b664af069 (diff) | |
| download | cmake-c103a959d12e810bb3eb8a8f155a171944d6a1ea.tar.gz | |
jsoncpp: Fix compilation on SunPro
The SunPro compiler does not support `#pragma pack`.
Diffstat (limited to 'Utilities/cmjsoncpp')
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/allocator.h | 4 | ||||
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/features.h | 4 | ||||
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/reader.h | 4 | ||||
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/value.h | 4 | ||||
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/writer.h | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/Utilities/cmjsoncpp/include/json/allocator.h b/Utilities/cmjsoncpp/include/json/allocator.h index 9c7e573aef..9562436c6c 100644 --- a/Utilities/cmjsoncpp/include/json/allocator.h +++ b/Utilities/cmjsoncpp/include/json/allocator.h @@ -9,7 +9,9 @@ #include <cstring> #include <memory> +#if !defined(__SUNPRO_CC) #pragma pack(push, 8) +#endif namespace Json { template<typename T> @@ -93,6 +95,8 @@ bool operator!=(const SecureAllocator<T>&, const SecureAllocator<U>&) { } //namespace Json +#if !defined(__SUNPRO_CC) #pragma pack(pop) +#endif #endif // CPPTL_JSON_ALLOCATOR_H_INCLUDED diff --git a/Utilities/cmjsoncpp/include/json/features.h b/Utilities/cmjsoncpp/include/json/features.h index 72eb6a8a01..365abb356d 100644 --- a/Utilities/cmjsoncpp/include/json/features.h +++ b/Utilities/cmjsoncpp/include/json/features.h @@ -10,7 +10,9 @@ #include "forwards.h" #endif // if !defined(JSON_IS_AMALGAMATION) +#if !defined(__SUNPRO_CC) #pragma pack(push, 8) +#endif namespace Json { @@ -56,6 +58,8 @@ public: } // namespace Json +#if !defined(__SUNPRO_CC) #pragma pack(pop) +#endif #endif // CPPTL_JSON_FEATURES_H_INCLUDED diff --git a/Utilities/cmjsoncpp/include/json/reader.h b/Utilities/cmjsoncpp/include/json/reader.h index f690f23cbc..01414e66db 100644 --- a/Utilities/cmjsoncpp/include/json/reader.h +++ b/Utilities/cmjsoncpp/include/json/reader.h @@ -23,7 +23,9 @@ #pragma warning(disable : 4251) #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) +#if !defined(__SUNPRO_CC) #pragma pack(push, 8) +#endif namespace Json { @@ -402,7 +404,9 @@ JSON_API JSONCPP_ISTREAM& operator>>(JSONCPP_ISTREAM&, Value&); } // namespace Json +#if !defined(__SUNPRO_CC) #pragma pack(pop) +#endif #if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) #pragma warning(pop) diff --git a/Utilities/cmjsoncpp/include/json/value.h b/Utilities/cmjsoncpp/include/json/value.h index 2ee227b52c..752636035b 100644 --- a/Utilities/cmjsoncpp/include/json/value.h +++ b/Utilities/cmjsoncpp/include/json/value.h @@ -42,7 +42,9 @@ #pragma warning(disable : 4251) #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) +#if !defined(__SUNPRO_CC) #pragma pack(push, 8) +#endif /** \brief JSON (JavaScript Object Notation). */ @@ -878,7 +880,9 @@ template<> inline void swap(Json::Value& a, Json::Value& b) { a.swap(b); } } +#if !defined(__SUNPRO_CC) #pragma pack(pop) +#endif #if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) #pragma warning(pop) diff --git a/Utilities/cmjsoncpp/include/json/writer.h b/Utilities/cmjsoncpp/include/json/writer.h index c98bf602de..ca08a6f933 100644 --- a/Utilities/cmjsoncpp/include/json/writer.h +++ b/Utilities/cmjsoncpp/include/json/writer.h @@ -21,7 +21,9 @@ #pragma warning(disable : 4251) #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) +#if !defined(__SUNPRO_CC) #pragma pack(push, 8) +#endif namespace Json { @@ -329,7 +331,9 @@ JSON_API JSONCPP_OSTREAM& operator<<(JSONCPP_OSTREAM&, const Value& root); } // namespace Json +#if !defined(__SUNPRO_CC) #pragma pack(pop) +#endif #if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) #pragma warning(pop) |