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 /qt/ScintillaEditBase/PlatQt.cpp | |
| 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 'qt/ScintillaEditBase/PlatQt.cpp')
| -rw-r--r-- | qt/ScintillaEditBase/PlatQt.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index e288cf5bf..713f4c46f 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -37,9 +37,7 @@ #include <QElapsedTimer> #include <cstdio> -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif //---------------------------------------------------------------------- @@ -1245,6 +1243,4 @@ double ElapsedTime::Duration(bool reset) return result / 1000000000.0; // 1 billion nanoseconds in a second } -#ifdef SCI_NAMESPACE } -#endif |