Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: compiled/library.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:
View side-by-side diff with in-line comments
Download patch
Index: compiled/library.h
diff --git a/compiled/library.h b/compiled/library.h
index 77076df28349d379147902249c11c5e7a1ca4ec5..5950cfb62652853efb832a9e584948c5db7e2572 100644
--- a/compiled/library.h
+++ b/compiled/library.h
@@ -17,6 +17,10 @@
#pragma once
+#include "base.h"
+
+ABP_NS_BEGIN
+
class String;
class Filter;
class Subscription;
@@ -26,18 +30,20 @@ namespace FilterNotifier
enum class Topic;
}
+ABP_NS_END
+
extern "C"
{
- void LogString(const String& str);
+ void LogString(const ABP_NS::String& str);
void LogInteger(int i);
void LogPointer(const void* ptr);
- void LogError(const String& str);
+ void LogError(const ABP_NS::String& str);
char16_t CharToLower(char16_t charCode);
- void JSNotifyFilterChange(FilterNotifier::Topic topic, Filter& filter,
- Subscription* subscription, unsigned int position);
- void JSNotifySubscriptionChange(FilterNotifier::Topic topic,
- Subscription& subscription);
- int GenerateRegExp(const String& regexp, bool matchCase);
+ void JSNotifyFilterChange(ABP_NS::FilterNotifier::Topic topic, ABP_NS::Filter& filter,
+ ABP_NS::Subscription* subscription, unsigned int position);
+ void JSNotifySubscriptionChange(ABP_NS::FilterNotifier::Topic topic,
+ ABP_NS::Subscription& subscription);
+ int GenerateRegExp(const ABP_NS::String& regexp, bool matchCase);
void DeleteRegExp(int id);
- bool TestRegExp(int id, const String& str);
+ bool TestRegExp(int id, const ABP_NS::String& str);
}

Powered by Google App Engine
This is Rietveld