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: Fix debug.h to be aligned with assert2 (define vs function) and get rid of a warning in generator.cpp Created Nov. 21, 2017, 2:53 p.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.h"
	hub 2017/11/21 16:48:39 I would call this "user-config.h". and the present I would call this "user-config.h". and the present header config.h instead of base.h. We could also consider having it generated from the build system. But this is just my suggestion. Also I would just have the content of "user.h" here if ABP_USER_CONFIG is undefined. sergei 2017/11/22 09:39:26 I like to have config.h with a more specific part Show quoted text On 2017/11/21 16:48:39, hub wrote: > I would call this "user-config.h". and the present header config.h instead of > base.h. I like to have config.h with a more specific part user-config.h which is also close to ABP_USER_CONFIG. I actually thought about config/user.h and just omitted 'config' for the sake of simplicity. I have renamed user.h to user-config.h. What concerns base.h, I considered it as not only a place for configuration. For instance base.h could also include some additional very common headers or have some project specific defines. So, when we need it in my opinion we should not go again through all relevant files and change config.h to some base.h. Therefore I would propose to have base.h include config.h include user-config.h but currently having both config.h and base.h seems redundant, so I would propose to not complicate it for present, it will be very easy to add config.h when it's really needed. What do you think about it? Show quoted text > > We could also consider having it generated from the build system. > > But this is just my suggestion. > > Also I would just have the content of "user.h" here if ABP_USER_CONFIG is > undefined. The idea is that one can simply copy user-config.h and adjust few parameters, if it is inlined then one will have to firstly figure out what should be in a custom user-config.h. So, IMO it should not be inlined.
23 #else

24 #define BINDINGS_EXPORTED

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

« no previous file with comments | « compiled/StringScanner.h ('k') | compiled/bindings/generator.h » ('j') | compiled/bindings/generator.cpp » ('J')