diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-09-11 09:05:35 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-09-11 09:05:35 +1000 |
| commit | d3c03f65fe25e133b8ef8a5f67b675b434605305 (patch) | |
| tree | 648194fe02ee266b1e4ee4530a3978037e883bc5 /src/ScintillaBase.cxx | |
| parent | 566b81a2fda39f83e4fbc860388385c2d3087d33 (diff) | |
| download | scintilla-mirror-d3c03f65fe25e133b8ef8a5f67b675b434605305.tar.gz | |
Backport: The Scintilla namespace is always active for internal symbols and for the lexer and document interfaces.
Backport of changeset 6388:d62863ae40a3.
Diffstat (limited to 'src/ScintillaBase.cxx')
| -rw-r--r-- | src/ScintillaBase.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
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; |