From d3c03f65fe25e133b8ef8a5f67b675b434605305 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
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.
---
 src/Document.cxx | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'src/Document.cxx')

diff --git a/src/Document.cxx b/src/Document.cxx
index 01c38a579..68911a6fa 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -52,9 +52,7 @@
 #include "UniConversion.h"
 #include "UnicodeFromUTF8.h"
 
-#ifdef SCI_NAMESPACE
 using namespace Scintilla;
-#endif
 
 void LexInterface::Colourise(Sci::Position start, Sci::Position end) {
 	if (pdoc && instance && !performingStyle) {
@@ -3098,18 +3096,8 @@ const char *BuiltinRegex::SubstituteByPosition(Document *doc, const char *text,
 
 #ifndef SCI_OWNREGEX
 
-#ifdef SCI_NAMESPACE
-
 RegexSearchBase *Scintilla::CreateRegexSearch(CharClassify *charClassTable) {
 	return new BuiltinRegex(charClassTable);
 }
 
-#else
-
-RegexSearchBase *CreateRegexSearch(CharClassify *charClassTable) {
-	return new BuiltinRegex(charClassTable);
-}
-
-#endif
-
 #endif
-- 
cgit v1.2.3