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 | 313a81f7f8419b3c1ac6ac57ea7719c7b8aa28cf (patch) | |
| tree | 2ec6649c5e74a1d7127d150f485432def1814a1a /win32 | |
| parent | 7b287ecd7f8527bb8f47e08090a0120ff418c730 (diff) | |
| download | scintilla-mirror-313a81f7f8419b3c1ac6ac57ea7719c7b8aa28cf.tar.gz | |
The Scintilla namespace is always active for internal symbols and for the lexer
interfaces ILexer4 and IDocument.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/HanjaDic.cxx | 4 | ||||
| -rw-r--r-- | win32/HanjaDic.h | 4 | ||||
| -rw-r--r-- | win32/PlatWin.cxx | 4 | ||||
| -rw-r--r-- | win32/PlatWin.h | 4 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 2 |
5 files changed, 0 insertions, 18 deletions
diff --git a/win32/HanjaDic.cxx b/win32/HanjaDic.cxx index d9640be7e..ccc303a99 100644 --- a/win32/HanjaDic.cxx +++ b/win32/HanjaDic.cxx @@ -13,9 +13,7 @@ #include "UniConversion.h" #include "HanjaDic.h" -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif namespace HanjaDict { @@ -126,6 +124,4 @@ int GetHangulOfHanja(wchar_t *inout) { } } -#ifdef SCI_NAMESPACE } -#endif diff --git a/win32/HanjaDic.h b/win32/HanjaDic.h index d58735dca..3aafdf8ed 100644 --- a/win32/HanjaDic.h +++ b/win32/HanjaDic.h @@ -9,9 +9,7 @@ #ifndef HANJADIC_H #define HANJADIC_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif namespace HanjaDict { @@ -19,8 +17,6 @@ int GetHangulOfHanja(wchar_t *inout); } -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 355a35145..3c0d44f6b 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -72,9 +72,7 @@ static HINSTANCE hinstPlatformRes = 0; static HCURSOR reverseArrowCursor = NULL; -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif static RECT RectFromPRectangle(PRectangle prc) { RECT rc = {static_cast<LONG>(prc.left), static_cast<LONG>(prc.top), @@ -3088,6 +3086,4 @@ void Platform_Finalise(bool fromDllMain) { ::DeleteCriticalSection(&crPlatformLock); } -#ifdef SCI_NAMESPACE } -#endif diff --git a/win32/PlatWin.h b/win32/PlatWin.h index e5913ba17..eff1fea01 100644 --- a/win32/PlatWin.h +++ b/win32/PlatWin.h @@ -8,9 +8,7 @@ #ifndef PLATWIN_H #define PLATWIN_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif extern void Platform_Initialise(void *hInstance); extern void Platform_Finalise(bool fromDllMain); @@ -21,8 +19,6 @@ extern ID2D1Factory *pD2DFactory; extern IDWriteFactory *pIDWriteFactory; #endif -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index de1d6b8b4..2d2fc266c 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -137,9 +137,7 @@ typedef UINT_PTR (WINAPI *SetCoalescableTimerSig)(HWND hwnd, UINT_PTR nIDEvent, const TCHAR callClassName[] = TEXT("CallTip"); -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void *PointerFromWindow(HWND hWnd) { return reinterpret_cast<void *>(::GetWindowLongPtr(hWnd, 0)); |