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

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

Unified Diff: compiled/subscription/Subscription.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.

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

Jump to:

Index: compiled/subscription/Subscription.h

diff --git a/compiled/subscription/Subscription.h b/compiled/subscription/Subscription.h

index acbe864a0fd4bac98f22a9a7dfd4c42fd5af1e18..ebaed9ccd899accddd912f20d1eaee3e82374a47 100644

--- a/compiled/subscription/Subscription.h

+++ b/compiled/subscription/Subscription.h

@@ -20,6 +20,7 @@

#include <type_traits>

#include <vector>

+#include "../base.h"

#include "../filter/Filter.h"

#include "../String.h"

#include "../FilterNotifier.h"

@@ -40,9 +41,9 @@

if (name != value)\

name = value;\

- if (FilterNotifier::Topic::topic != FilterNotifier::Topic::NONE)\

+ if (ABP_NS::FilterNotifier::Topic::topic != ABP_NS::FilterNotifier::Topic::NONE)\

- FilterNotifier::SubscriptionChange(FilterNotifier::Topic::topic,\

+ ABP_NS::FilterNotifier::SubscriptionChange(ABP_NS::FilterNotifier::Topic::topic,\

*this);\

@@ -55,6 +56,8 @@

#define SUBSCRIPTION_STRING_PROPERTY(name, topic, getter, setter) \

SUBSCRIPTION_PROPERTY_INTERNAL(OwnedString, const String&, name, topic, getter, setter)

+ABP_NS_BEGIN

class Subscription : public ref_counted

{

public:

@@ -104,3 +107,5 @@ public:

};

typedef intrusive_ptr<Subscription> SubscriptionPtr;

+ABP_NS_END