compiled/user.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/user.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

« compiled/filter/ElemHideEmulationFilter.cpp ('K') | « compiled/traceInit.cpp ('k') | no next file » | no next file with comments »

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 extern "C"	20 #define ABP_NS

21 {	21 #define ABP_NS_BEGIN

22 int GetFunctionName(char* buffer, void* ptr, const char* signature);	22 #define ABP_NS_END

23 }	23 #define ABP_NS_USING
	hub 2017/11/21 16:48:39 I think we should just need to define ABP_NS. #de I think we should just need to define ABP_NS. #define ABP_NS my_namespace #if defined(ABP_NS) #define ABP_NS_BEGIN namespace ABP_NS { #define ABP_NS_END } #define ABP_NS_USING using ABP_NS; #else #define ABP_NS #define ABP_NS_BEGIN #define ABP_NS_END #define ABP_NS_USING #endif And as I mentionned above, possibly have this in "base.h" sergei 2017/11/22 09:39:27 I just tried to keep it small and simple :) but I Show quoted text On 2017/11/21 16:48:39, hub wrote: > I think we should just need to define ABP_NS. > > #define ABP_NS my_namespace > > #if defined(ABP_NS) > #define ABP_NS_BEGIN namespace ABP_NS { > #define ABP_NS_END } > #define ABP_NS_USING using ABP_NS; > #else > #define ABP_NS > #define ABP_NS_BEGIN > #define ABP_NS_END > #define ABP_NS_USING > #endif > > > And as I mentionned above, possibly have this in "base.h" I just tried to keep it small and simple :) but I agree it can be more user-friendly, added it.
	24

OLD	NEW