[Libreoffice-commits] core.git: basic/source

[Takeshi Abe]

 basic/source/comp/dim.cxx   |    9 +--------
 basic/source/comp/io.cxx    |    8 --------
 basic/source/comp/token.cxx |    8 --------
 basic/source/inc/token.hxx  |   10 ----------
 4 files changed, 1 insertion(+), 34 deletions(-)

New commits:
commit 9425245a873f16650c666928de3b89785e4c5563
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed May 10 18:32:25 2017 +0900

    basic: Remove strange ifdef-guard for SHARED
    
    Was there any platform predefining it?
    
    Change-Id: I4c155c00272b426c0d2b1b1ec0184cc223f9e38c
    Reviewed-on: https://gerrit.libreoffice.org/37461
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 1ea7ce3c6ca5..3b3a0e75bd5c 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -276,16 +276,9 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
         }
     }
 
-#ifdef SHARED
-#define tmpSHARED
-#undef SHARED
-#endif
     // SHARED were ignored
     if( Peek() == SHARED ) Next();
-#ifdef tmpSHARED
-#define SHARED
-#undef tmpSHARED
-#endif
+
     // PRESERVE only at REDIM
     if( Peek() == PRESERVE )
     {
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 5314874f3521..d5954a0fe236 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -212,16 +212,8 @@ void SbiParser::Open()
     }
     switch( Peek() )
     {
-#ifdef SHARED
-#undef SHARED
-#define tmpSHARED
-#endif
         case SHARED:
             Next(); nMode |= StreamMode::SHARE_DENYNONE; break;
-#ifdef tmpSHARED
-#define SHARED
-#undef tmpSHARED
-#endif
         case LOCK:
             Next();
             eTok = Next();
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 0fd91c4def1b..ca57eb04dcc2 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -151,15 +151,7 @@ static const TokenTable aTokTable_Basic [] = {
     { RSET,     "RSet" }, // JSM
     { SELECT,   "Select" },
     { SET,      "Set" },
-#ifdef SHARED
-#undef SHARED
-#define tmpSHARED
-#endif
     { SHARED,   "Shared" },
-#ifdef tmpSHARED
-#define SHARED
-#undef tmpSHARED
-#endif
     { TSINGLE,  "Single" },
     { STATIC,   "Static" },
     { STEP,     "Step" },
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index 6f850b814d89..483aab1c3dac 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -23,11 +23,6 @@
 #include "scanner.hxx"
 #include <basic/sbdef.hxx>
 
-#if defined( SHARED )
-#define SbiTokenSHAREDTMPUNDEF
-#undef SHARED
-#endif
-
 #if defined( EXPLICIT )
 #undef EXPLICIT
 #endif
@@ -109,11 +104,6 @@ enum SbiToken {
     , VBASUPPORT
 };
 
-#ifdef SbiTokenSHAREDTMPUNDEF
-#define SHARED
-#undef SbiTokenSHAREDTMPUNDEF
-#endif
-
 class SbiTokenizer : public SbiScanner {
 protected:
     SbiToken eCurTok;