generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-05 18:41:10 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #699 from MarcelRaad/msvc_warnings

Browse Source 
MSVC warning fixes in tests
This commit is contained in:
Christopher Dunn 2017-11-16 13:08:39 -06:00 committed by GitHub
commit c469326b47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jsontestrunner/main.cpp
View File

@ -3,8 +3,12 @@
// recognized in your jurisdiction. // recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#if defined(__GNUC__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined(_MSC_VER)
#pragma warning(disable : 4996)
#endif
/* This executable is used for testing parser/writer using real JSON files. /* This executable is used for testing parser/writer using real JSON files.
*/ */
@ -14,10 +18,6 @@
#include <sstream> #include <sstream>
#include <stdio.h> #include <stdio.h>
#if defined(_MSC_VER) && _MSC_VER >= 1310
#pragma warning(disable : 4996) // disable fopen deprecation warning
#endif
struct Options struct Options
{ {
JSONCPP_STRING path; JSONCPP_STRING path;
@ -328,4 +328,6 @@ int main(int argc, const char* argv[]) {
} }
} }
#if defined(__GNUC__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif

6
src/test_lib_json/main.cpp
View File

@ -3,8 +3,12 @@
// recognized in your jurisdiction. // recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#if defined(__GNUC__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif defined(_MSC_VER)
#pragma warning(disable : 4996)
#endif
#include "jsontest.h" #include "jsontest.h"
#include <json/config.h> #include <json/config.h>
@ -2591,4 +2595,6 @@ int main(int argc, const char* argv[]) {
return runner.runCommandLine(argc, argv); return runner.runCommandLine(argc, argv);
} }
#if defined(__GNUC__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif