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/ScintillaBase.cxx | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/ScintillaBase.cxx')

diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 64e0c9ff7..35e601116 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -61,9 +61,7 @@
 #include "AutoComplete.h"
 #include "ScintillaBase.h"
 
-#ifdef SCI_NAMESPACE
 using namespace Scintilla;
-#endif
 
 ScintillaBase::ScintillaBase() {
 	displayPopupMenu = SC_POPUP_ALL;
@@ -545,9 +543,7 @@ void ScintillaBase::RightButtonDownWithModifiers(Point pt, unsigned int curTime,
 
 #ifdef SCI_LEXER
 
-#ifdef SCI_NAMESPACE
 namespace Scintilla {
-#endif
 
 class LexState : public LexInterface {
 	const LexerModule *lexCurrent;
@@ -589,9 +585,7 @@ public:
 	const char *DescriptionOfStyle(int style);
 };
 
-#ifdef SCI_NAMESPACE
 }
-#endif
 
 LexState::LexState(Document *pdoc_) : LexInterface(pdoc_) {
 	lexCurrent = 0;
-- 
cgit v1.2.3