From 20e2f43fcc3749560db4792536f5773bec650752 Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Tue, 11 Aug 2020 15:38:04 -0400 Subject: [PATCH 1/3] let ssc use pgi compiler --- cmake/DetectOptions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake index f73592771d..2f56a93a13 100644 --- a/cmake/DetectOptions.cmake +++ b/cmake/DetectOptions.cmake @@ -179,7 +179,7 @@ endif() # SSC # SSC currently breaks the PGI compiler -if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "PGI") AND NOT MSVC) +if(NOT MSVC) if(ADIOS2_HAVE_MPI) if(ADIOS2_USE_SSC STREQUAL AUTO) set(ADIOS2_HAVE_SSC TRUE) From 6762dba88b10182857a1305f3b124615e635b33d Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Tue, 11 Aug 2020 17:38:23 -0400 Subject: [PATCH 2/3] fixed compiler warnings in nlogmann::json --- .../nlohmann_json/src/single_include/nlohmann/json.hpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/thirdparty/nlohmann_json/nlohmann_json/src/single_include/nlohmann/json.hpp b/thirdparty/nlohmann_json/nlohmann_json/src/single_include/nlohmann/json.hpp index c9af0bed36..746eb844a7 100644 --- a/thirdparty/nlohmann_json/nlohmann_json/src/single_include/nlohmann/json.hpp +++ b/thirdparty/nlohmann_json/nlohmann_json/src/single_include/nlohmann/json.hpp @@ -11410,6 +11410,14 @@ class serializer } } + template::value, int> = 0> + bool is_negative_integer(NumberType x) { return false; } + + template::value, int> = 0> + bool is_negative_integer(NumberType x) { return x<0; } + /*! @brief dump an integer @@ -11432,7 +11440,7 @@ class serializer return; } - const bool is_negative = std::is_same::value and not (x >= 0); // see issue #755 + const bool is_negative = is_negative_integer(x); // see issue #755 std::size_t i = 0; while (x != 0) From 8b67cefa163f5d059b0e03b4d77e8c4c4d877876 Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Tue, 11 Aug 2020 17:57:03 -0400 Subject: [PATCH 3/3] fixed unreachable warning --- source/adios2/engine/ssc/SscHelper.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source/adios2/engine/ssc/SscHelper.cpp b/source/adios2/engine/ssc/SscHelper.cpp index 7026ffec99..926d1236d3 100644 --- a/source/adios2/engine/ssc/SscHelper.cpp +++ b/source/adios2/engine/ssc/SscHelper.cpp @@ -48,11 +48,7 @@ size_t TotalDataSize(const Dims &dims, DataType type, const ShapeID &shapeId) { return GetTypeSize(type); } - else - { - throw(std::runtime_error("ShapeID not supported")); - } - return 0; + throw(std::runtime_error("ShapeID not supported")); } size_t TotalDataSize(const BlockVec &bv)