From d3c03f65fe25e133b8ef8a5f67b675b434605305 Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 11 Sep 2017 09:05:35 +1000 Subject: Backport: The Scintilla namespace is always active for internal symbols and for the lexer and document interfaces. Backport of changeset 6388:d62863ae40a3. --- include/ILexer.h | 4 ---- include/Platform.h | 8 -------- 2 files changed, 12 deletions(-) (limited to 'include') diff --git a/include/ILexer.h b/include/ILexer.h index fe6e18e3b..42f980f89 100644 --- a/include/ILexer.h +++ b/include/ILexer.h @@ -10,9 +10,7 @@ #include "Sci_Position.h" -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif enum { dvOriginal=0, dvLineEnd=1 }; @@ -87,8 +85,6 @@ public: virtual const char * SCI_METHOD DescriptionOfStyle(int style) = 0; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/include/Platform.h b/include/Platform.h index a18ef2255..e1c8a4c76 100644 --- a/include/Platform.h +++ b/include/Platform.h @@ -71,9 +71,7 @@ #endif -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif typedef float XYPOSITION; typedef double XYACCUMULATOR; @@ -511,15 +509,9 @@ public: #ifdef NDEBUG #define PLATFORM_ASSERT(c) ((void)0) #else -#ifdef SCI_NAMESPACE #define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Scintilla::Platform::Assert(#c, __FILE__, __LINE__)) -#else -#define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Platform::Assert(#c, __FILE__, __LINE__)) -#endif #endif -#ifdef SCI_NAMESPACE } -#endif #endif -- cgit v1.2.3