compiled/base.h - Issue 29613616: Issue 6064 - Put C++ code into a configurable namespace

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: compiled/base.h

Issue 29613616: Issue 6064 - Put C++ code into a configurable namespace (Closed) Base URL: https://github.com/adblockplus/adblockpluscore.git

Patch Set: rebase Created Feb. 6, 2018, 9:54 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * This file is part of Adblock Plus <https://adblockplus.org/>,	2 * This file is part of Adblock Plus <https://adblockplus.org/>,

3 * Copyright (C) 2006-present eyeo GmbH	3 * Copyright (C) 2006-present eyeo GmbH

4 *	4 *

5 * Adblock Plus is free software: you can redistribute it and/or modify	5 * Adblock Plus is free software: you can redistribute it and/or modify

6 * it under the terms of the GNU General Public License version 3 as	6 * it under the terms of the GNU General Public License version 3 as

7 * published by the Free Software Foundation.	7 * published by the Free Software Foundation.

8 *	8 *

9 * Adblock Plus is distributed in the hope that it will be useful,	9 * Adblock Plus is distributed in the hope that it will be useful,

10 * but WITHOUT ANY WARRANTY; without even the implied warranty of	10 * but WITHOUT ANY WARRANTY; without even the implied warranty of

11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12 * GNU General Public License for more details.	12 * GNU General Public License for more details.

13 *	13 *

14 * You should have received a copy of the GNU General Public License	14 * You should have received a copy of the GNU General Public License

15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.	15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

16 */	16 */

17	17

18 #pragma once	18 #pragma once

19	19

20 #if defined(__EMSCRIPTEN__)	20 // if a user config is not specified then use the default location.

21 #include <emscripten.h>	21 #if !defined(ABP_USER_CONFIG)

22 #define BINDINGS_EXPORTED EMSCRIPTEN_KEEPALIVE	22 # define ABP_USER_CONFIG "user-config.h"

23 #else

24 #define BINDINGS_EXPORTED
hub 2018/02/06 14:59:31 Where did these go? Where did these go? sergei 2018/02/06 15:01:59 base.h is a new file but Rietveld thinks that it's Show quoted text On 2018/02/06 14:59:31, hub wrote: > Where did these go? base.h is a new file but Rietveld thinks that it's copied from another file, so basically these lines didn't go because they didn't exist. hub 2018/02/06 15:05:01 ok Show quoted text On 2018/02/06 15:01:59, sergei wrote: > On 2018/02/06 14:59:31, hub wrote: > > Where did these go? > > base.h is a new file but Rietveld thinks that it's copied from another file, so > basically these lines didn't go because they didn't exist. ok
25 #endif	23 #endif

	24 // it should be the first included file

	25 #ifdef ABP_USER_CONFIG

	26 #include ABP_USER_CONFIG

	27 #endif

OLD	NEW

« compiled/StringMap.h ('K') | « compiled/Utils.cpp ('k') | compiled/bindings/generator.h » ('j') | no next file with comments »