summarylogtreecommitdiffstats
path: root/no-assert.patch
blob: a90c63bddfa859d5067741d283fb8c9b99ed2252 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
diff --git a/include/json/jsonxx.h b/include/json/jsonxx.h
index 8c5b5a1..1fd610f 100644
--- a/include/json/jsonxx.h
+++ b/include/json/jsonxx.h
@@ -43,13 +43,13 @@
     __pragma(warning(push)) __pragma(warning(disable:4127)) \
     if( jsonxx::Assertions ) \
     __pragma(warning(pop)) \
-      jsonxx::assertion(__FILE__,__LINE__,#__VA_ARGS__,bool(__VA_ARGS__)); \
+      jsonxx::assertion("jsonxx.h",__LINE__,#__VA_ARGS__,bool(__VA_ARGS__)); \
   __pragma(warning(push)) __pragma(warning(disable:4127)) \
   } while(0) \
   __pragma(warning(pop))
 #else
 #define JSONXX_ASSERT(...) do { if( jsonxx::Assertions ) \
-  jsonxx::assertion(__FILE__,__LINE__,#__VA_ARGS__,bool(__VA_ARGS__)); } while(0)
+  jsonxx::assertion("jsonxx.h",__LINE__,#__VA_ARGS__,bool(__VA_ARGS__)); } while(0)
 #endif
 
 namespace jsonxx {
@@ -65,7 +65,7 @@ enum Settings {
   // values
   Parser = Permissive,  // permissive or strict parsing
   UnquotedKeys = Disabled, // support of unquoted keys
-  Assertions = Enabled  // enabled or disabled assertions (these asserts work both in DEBUG and RELEASE builds)
+  Assertions = Disabled  // enabled or disabled assertions (these asserts work both in DEBUG and RELEASE builds)
 };
 
 #ifdef _MSC_VER