Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: include/utils/SkJSONCPP.h

Issue 83863002: Add JSON output option to bench. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: %040s is not the same as %40s, at least on Mac. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« bench/ResultsWriter.h ('K') | « gyp/bench.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 /*
2 * Copyright 2013 Google Inc.
3 *
4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file.
6 *
7 * A common place to put the jsoncpp library includes, as opposed to littering
8 * the pragmas repeatedly through our code.
9 */
10 #ifndef SkJSONCPP_DEFINED
11 #define SkJSONCPP_DEFINED
12
13 #ifdef SK_BUILD_FOR_WIN
14 // json includes xlocale which generates warning 4530 because we're
15 // compiling without exceptions;
16 // see https://code.google.com/p/skia/issues/detail?id=1067
17 #pragma warning(push)
18 #pragma warning(disable : 4530)
19 #endif
20 #include "json/reader.h"
21 #include "json/value.h"
22 #ifdef SK_BUILD_FOR_WIN
23 #pragma warning(pop)
24 #endif
25
26 #endif
OLDNEW
« bench/ResultsWriter.h ('K') | « gyp/bench.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698