Unified Diff: compiled/debug.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.
« compiled/bindings/generator.cpp ('K')
|
« compiled/bindings/runtime_utils.cpp ('k')
|
compiled/filter/ActiveFilter.h » ('j')
|
compiled/filter/ElemHideEmulationFilter.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: compiled/debug.h |
| diff --git a/compiled/debug.h b/compiled/debug.h |
| index f8cb40203618cbb25f548e22cd4ca167232746ad..b0447b3e436b9258890927bd43eb4aa85db2b110 100644 |
| --- a/compiled/debug.h |
| +++ b/compiled/debug.h |
| @@ -17,8 +17,10 @@ |
| #pragma once |
| +#include "base.h" |
| #include "library.h" |
| +ABP_NS_BEGIN |
| class String; |
| struct console_type |
| @@ -45,12 +47,13 @@ struct console_type |
| }; |
| static console_type console; |
| +ABP_NS_END |
| #if defined(DEBUG) |
| inline void assert2(bool condition, const String& str) |
| { |
| if (!condition) |
| - console.error(str); |
| + ABP_NS::console.error(str); |
| } |
| #else |
| #define assert2(condition, str) |
| @@ -59,6 +62,8 @@ inline void assert2(bool condition, const String& str) |
| #if defined(__EMSCRIPTEN_TRACING__) |
| #include <emscripten/trace.h> |
| +ABP_NS_BEGIN |
| + |
| inline void init_tracing() |
| { |
| emscripten_trace_configure("http://127.0.0.1:5000/", "MyApplication"); |
| @@ -84,8 +89,12 @@ inline void exit_context() |
| emscripten_trace_exit_context(); |
| } |
| +ABP_NS_END |
| + |
| #else // defined(__EMSCRIPTEN_TRACING__) |
| +ABP_NS_BEGIN |
| + |
| inline void init_tracing() |
| { |
| } |
| @@ -106,4 +115,6 @@ inline void exit_context() |
| { |
| } |
| +ABP_NS_END |
| + |
| #endif // defined(__EMSCRIPTEN_TRACING__) |
