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

(limited to 'src/EditView.cxx')

diff --git a/src/EditView.cxx b/src/EditView.cxx
index 011d16575..8db21d5d9 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -54,9 +54,7 @@
 #include "MarginView.h"
 #include "EditView.h"
 
-#ifdef SCI_NAMESPACE
 using namespace Scintilla;
-#endif
 
 static inline bool IsControlCharacter(int ch) {
 	// iscntrl returns true for lots of chars > 127 which are displayable
@@ -69,9 +67,7 @@ PrintParameters::PrintParameters() {
 	wrapState = eWrapWord;
 }
 
-#ifdef SCI_NAMESPACE
 namespace Scintilla {
-#endif
 
 bool ValidStyledText(const ViewStyle &vs, size_t styleOffset, const StyledText &st) {
 	if (st.multipleStyles) {
@@ -171,9 +167,7 @@ void DrawStyledText(Surface *surface, const ViewStyle &vs, int styleOffset, PRec
 	}
 }
 
-#ifdef SCI_NAMESPACE
 }
-#endif
 
 const XYPOSITION epsilon = 0.0001f;	// A small nudge to avoid floating point precision issues
 
-- 
cgit v1.2.3