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/CaseConvert.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/CaseConvert.cxx')
| -rw-r--r-- | src/CaseConvert.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
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 |