include/utils/SkJSONCPP.h - Issue 282053002: Generate bench/Android.mk from gyp.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 282053002: Generate bench/Android.mk from gyp. (Closed) Base URL: https://skia.googlesource.com/skia.git@baselines

Patch Set: Remove modifications to generated files to submit. Created 6 years, 7 months 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

OLD	NEW
1 /*	1 /*

2 * Copyright 2013 Google Inc.	2 * Copyright 2013 Google Inc.

3 *	3 *

4 * Use of this source code is governed by a BSD-style license that can be	4 * Use of this source code is governed by a BSD-style license that can be

5 * found in the LICENSE file.	5 * found in the LICENSE file.

6 *	6 *

7 * A common place to put the jsoncpp library includes, as opposed to littering	7 * A common place to put the jsoncpp library includes, as opposed to littering

8 * the pragmas repeatedly through our code.	8 * the pragmas repeatedly through our code.

9 */	9 */

10 #ifndef SkJSONCPP_DEFINED	10 #ifndef SkJSONCPP_DEFINED

11 #define SkJSONCPP_DEFINED	11 #define SkJSONCPP_DEFINED

12	12

	13 #ifdef SK_BUILD_JSON_WRITER

	14

13 #ifdef SK_BUILD_FOR_WIN	15 #ifdef SK_BUILD_FOR_WIN

14 // json includes xlocale which generates warning 4530 because we're	16 // json includes xlocale which generates warning 4530 because we're

15 // compiling without exceptions;	17 // compiling without exceptions;

16 // see https://code.google.com/p/skia/issues/detail?id=1067	18 // see https://code.google.com/p/skia/issues/detail?id=1067

17 #pragma warning(push)	19 #pragma warning(push)

18 #pragma warning(disable : 4530)	20 #pragma warning(disable : 4530)

19 #endif	21 #endif

20 #include "json/reader.h"	22 #include "json/reader.h"

21 #include "json/value.h"	23 #include "json/value.h"

22 #ifdef SK_BUILD_FOR_WIN	24 #ifdef SK_BUILD_FOR_WIN

23 #pragma warning(pop)	25 #pragma warning(pop)

24 #endif	26 #endif

25	27

26 #endif	28 #endif // SK_BUILD_JSON_WRITER

	29

	30 #endif // SkJSONCPP_DEFINED

OLD	NEW

« no previous file with comments | « gyp/jsoncpp.gyp ('k') | platform_tools/android/bin/gyp_to_android.py » ('j') | no next file with comments »