Merge pull request Tencent#1162 from Tencent/travis

Fix Travis build due to clang noexcept issue in unittest
Fix Tencent#1159

Author: miloyip

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 

test/unittest/unittest.h

@@ -117,6 +117,9 @@ class AssertException : public std::logic_error {
 #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