ext/rj_schema/rapidjson/include/rapidjson/pointer.h in rj_schema-0.1.4 vs ext/rj_schema/rapidjson/include/rapidjson/pointer.h in rj_schema-0.2.0
- old
+ new
@@ -19,13 +19,11 @@
#include "internal/itoa.h"
#ifdef __clang__
RAPIDJSON_DIAG_PUSH
RAPIDJSON_DIAG_OFF(switch-enum)
-#endif
-
-#ifdef _MSC_VER
+#elif defined(_MSC_VER)
RAPIDJSON_DIAG_PUSH
RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
#endif
RAPIDJSON_NAMESPACE_BEGIN
@@ -1350,14 +1348,10 @@
//@}
RAPIDJSON_NAMESPACE_END
-#ifdef __clang__
-RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef _MSC_VER
+#if defined(__clang__) || defined(_MSC_VER)
RAPIDJSON_DIAG_POP
#endif
#endif // RAPIDJSON_POINTER_H_