From 313a81f7f8419b3c1ac6ac57ea7719c7b8aa28cf Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Mon, 11 Sep 2017 09:05:35 +1000
Subject: The Scintilla namespace is always active for internal symbols and for
 the lexer interfaces ILexer4 and IDocument.

---
 src/UniConversion.cxx | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/UniConversion.cxx')

diff --git a/src/UniConversion.cxx b/src/UniConversion.cxx
index b02850a06..e4eade7dc 100644
--- a/src/UniConversion.cxx
+++ b/src/UniConversion.cxx
@@ -12,13 +12,9 @@
 
 #include "UniConversion.h"
 
-#ifdef SCI_NAMESPACE
 using namespace Scintilla;
-#endif
 
-#ifdef SCI_NAMESPACE
 namespace Scintilla {
-#endif
 
 size_t UTF8Length(const wchar_t *uptr, size_t tlen) {
 	size_t len = 0;
@@ -327,6 +323,4 @@ std::string FixInvalidUTF8(const std::string &text) {
 	return result;
 }
 
-#ifdef SCI_NAMESPACE
 }
-#endif
-- 
cgit v1.2.3