Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/miloyip/rapidjson.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Yip <miloyip@gmail.com>2018-01-13 07:51:24 +0300
committerMilo Yip <miloyip@gmail.com>2018-01-13 07:51:24 +0300
commitd48290e387932ba016fb1d0117ac4b71edda45ae (patch)
treef9ff65855e38c9d79d8f718ea5746d8d77028c67
parent62e785babf57cee1522c69cb1a61e9549cc1da1f (diff)
Another try to fix travis buildtravis
-rw-r--r--test/unittest/namespacetest.cpp4
-rw-r--r--test/unittest/unittest.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/test/unittest/namespacetest.cpp b/test/unittest/namespacetest.cpp
index 9f5c9afb..1814724a 100644
--- a/test/unittest/namespacetest.cpp
+++ b/test/unittest/namespacetest.cpp
@@ -12,10 +12,6 @@
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License.
-// Not throwing exception for this test
-#include <cassert>
-#define RAPIDJSON_ASSERT(x) assert(x)
-
#include "unittest.h"
// test another instantiation of RapidJSON in a different namespace
diff --git a/test/unittest/unittest.h b/test/unittest/unittest.h
index 4b1c293c..84c1b734 100644
--- a/test/unittest/unittest.h
+++ b/test/unittest/unittest.h
@@ -117,6 +117,9 @@ public:
#pragma GCC diagnostic pop
#endif
+// Not using noexcept for testing RAPIDJSON_ASSERT()
+#define RAPIDJSON_HAS_CXX11_NOEXCEPT 0
+
#ifndef RAPIDJSON_ASSERT
#define RAPIDJSON_ASSERT(x) (!(x) ? throw AssertException(RAPIDJSON_STRINGIFY(x)) : (void)0u)
#endif