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

(limited to 'src/CaseConvert.cxx')

diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx
index 24205dd81..cef963c68 100644
--- a/src/CaseConvert.cxx
+++ b/src/CaseConvert.cxx
@@ -20,9 +20,7 @@
 #include "UniConversion.h"
 #include "UnicodeFromUTF8.h"
 
-#ifdef SCI_NAMESPACE
 using namespace Scintilla;
-#endif
 
 namespace {
 	// Use an unnamed namespace to protect the declarations from name conflicts
@@ -802,9 +800,7 @@ CaseConverter *ConverterForConversion(enum CaseConversion conversion) {
 
 }
 
-#ifdef SCI_NAMESPACE
 namespace Scintilla {
-#endif
 
 ICaseConverter *ConverterFor(enum CaseConversion conversion) {
 	CaseConverter *pCaseConv = ConverterForConversion(conversion);
@@ -835,6 +831,4 @@ std::string CaseConvertString(const std::string &s, enum CaseConversion conversi
 	return retMapped;
 }
 
-#ifdef SCI_NAMESPACE
 }
-#endif
-- 
cgit v1.2.3