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.
---
 lexlib/OptionSet.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'lexlib/OptionSet.h')

diff --git a/lexlib/OptionSet.h b/lexlib/OptionSet.h
index 2935a2089..b6fc07049 100644
--- a/lexlib/OptionSet.h
+++ b/lexlib/OptionSet.h
@@ -10,9 +10,7 @@
 #ifndef OPTIONSET_H
 #define OPTIONSET_H
 
-#ifdef SCI_NAMESPACE
 namespace Scintilla {
-#endif
 
 template <typename T>
 class OptionSet {
@@ -135,8 +133,6 @@ public:
 	}
 };
 
-#ifdef SCI_NAMESPACE
 }
-#endif
 
 #endif
-- 
cgit v1.2.3