diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-29 12:04:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-30 14:17:13 (GMT) |
| commit | c103a959d12e810bb3eb8a8f155a171944d6a1ea (patch) | |
| tree | aad0eda935833af129f23f48c9ac412bb96ac2b2 /Utilities/cmjsoncpp/include/json/reader.h | |
| parent | 0a0f71066f5206898ab8da789c04b17b664af069 (diff) | |
| download | CMake-c103a959d12e810bb3eb8a8f155a171944d6a1ea.zip CMake-c103a959d12e810bb3eb8a8f155a171944d6a1ea.tar.gz CMake-c103a959d12e810bb3eb8a8f155a171944d6a1ea.tar.bz2 | |
jsoncpp: Fix compilation on SunPro
The SunPro compiler does not support `#pragma pack`.
Diffstat (limited to 'Utilities/cmjsoncpp/include/json/reader.h')
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/reader.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Utilities/cmjsoncpp/include/json/reader.h b/Utilities/cmjsoncpp/include/json/reader.h index f690f23..01414e6 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) |