Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
R
rapidjson
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
rapidjson
Commits
a735badb
Unverified
Commit
a735badb
authored
Jan 13, 2018
by
Milo Yip
Committed by
GitHub
Jan 13, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1162 from Tencent/travis
Fix Travis build due to clang noexcept issue in unittest Fix #1159
parents
0d95d58f
d48290e3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
namespacetest.cpp
test/unittest/namespacetest.cpp
+0
-4
unittest.h
test/unittest/unittest.h
+3
-0
No files found.
test/unittest/namespacetest.cpp
View file @
a735badb
...
@@ -12,10 +12,6 @@
...
@@ -12,10 +12,6 @@
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License.
// 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"
#include "unittest.h"
// test another instantiation of RapidJSON in a different namespace
// test another instantiation of RapidJSON in a different namespace
...
...
test/unittest/unittest.h
View file @
a735badb
...
@@ -117,6 +117,9 @@ public:
...
@@ -117,6 +117,9 @@ public:
#pragma GCC diagnostic pop
#pragma GCC diagnostic pop
#endif
#endif
// Not using noexcept for testing RAPIDJSON_ASSERT()
#define RAPIDJSON_HAS_CXX11_NOEXCEPT 0
#ifndef RAPIDJSON_ASSERT
#ifndef RAPIDJSON_ASSERT
#define RAPIDJSON_ASSERT(x) (!(x) ? throw AssertException(RAPIDJSON_STRINGIFY(x)) : (void)0u)
#define RAPIDJSON_ASSERT(x) (!(x) ? throw AssertException(RAPIDJSON_STRINGIFY(x)) : (void)0u)
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment