From 2a469cc8054031ee127d0eeb711b5b90250443a0 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 18 Nov 2016 09:33:40 +1100 Subject: Remove the Scintilla namespace from Scintilla.h. --- doc/ScintillaHistory.html | 5 +++++ include/Scintilla.h | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 931a81a26..f29b7b86e 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -524,6 +524,11 @@ Released 16 October 2016.
  • + The Scintilla namespace is no longer applied to struct definitions in Scintilla.h even + when SCI_NAMESPACE defined. + Client code should not define SCI_NAMESPACE. +
    • +
  • Structure names in Scintilla.h without prefixes are deprecated and will now only be usable with INCLUDE_DEPRECATED_FEATURES defined.
    Use the newer names with the "Sci_" prefix:
    diff --git a/include/Scintilla.h b/include/Scintilla.h index 57373c24d..056b2e276 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -36,7 +36,7 @@ int Scintilla_LinkLexers(void); // Define uptr_t, an unsigned integer type large enough to hold a pointer. typedef uintptr_t uptr_t; -// Define sptr_t, a signed integer large enough to hold a pointer. +// Define sptr_t, a signed integer large enough to hold a pointer. typedef intptr_t sptr_t; #include "Sci_Position.h" @@ -1091,10 +1091,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, * CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs. * So older code that treats Scintilla as a RichEdit will work. */ -#if defined(__cplusplus) && defined(SCI_NAMESPACE) -namespace Scintilla { -#endif - struct Sci_CharacterRange { Sci_PositionCR cpMin; Sci_PositionCR cpMax; @@ -1186,10 +1182,6 @@ struct SCNotification { /* SCN_AUTOCSELECTION, SCN_AUTOCCOMPLETED, SCN_USERLISTSELECTION, */ }; -#if defined(__cplusplus) && defined(SCI_NAMESPACE) -} -#endif - #ifdef INCLUDE_DEPRECATED_FEATURES #define SCI_SETKEYSUNICODE 2521 -- cgit v1.2.3