diff options
| author |  mtklein <mtklein@chromium.org> | 2016-07-26 12:41:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-26 12:41:27 -0700 |
| commit | 1b51e0ec466026794f96e2c476f0c7f9db0f13dc (patch) | |
| tree | 980d3047ae1ed0f949dc4bfa42dacbc1d6f84257 /tools/SkJSONCPP.h | |
| parent | e93393b311ce88a15f64bdde58c05ea874f881f4 (diff) | |
Move SkJSONCPP.h to tools. It tool-only.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184483003
CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
TBR=reed@google.com
Review-Url: https://codereview.chromium.org/2184483003
Diffstat (limited to 'tools/SkJSONCPP.h')
| -rw-r--r-- | tools/SkJSONCPP.h | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/tools/SkJSONCPP.h b/tools/SkJSONCPP.h new file mode 100644 index 0000000000..6baf223610 --- /dev/null +++ b/tools/SkJSONCPP.h @@ -0,0 +1,33 @@ +/* + * Copyright 2013 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + * + * A common place to put the jsoncpp library includes, as opposed to littering + * the pragmas repeatedly through our code. + */ +#ifndef SkJSONCPP_DEFINED +#define SkJSONCPP_DEFINED + +#ifdef GOOGLE3 + #include "third_party/jsoncpp/reader.h" + #include "third_party/jsoncpp/value.h" + #include "third_party/jsoncpp/writer.h" +#else + #ifdef SK_BUILD_FOR_WIN + // json includes xlocale which generates warning 4530 because we're + // compiling without exceptions; + // see https://code.google.com/p/skia/issues/detail?id=1067 + #pragma warning(push) + #pragma warning(disable : 4530) + #endif + #include "json/reader.h" + #include "json/value.h" + #include "json/writer.h" + #ifdef SK_BUILD_FOR_WIN + #pragma warning(pop) + #endif +#endif + +#endif // SkJSONCPP_DEFINED |