Re: [Libreoffice] [PATCH] Remove TCPP support

Hi,

TCPP seems to be an old compiler. Google doesn't know anything about it,
but there were some comments in the source which let me conclude that
this a compiler. I've removed it from filter and writer. For libs-gui I
need a review, because there's a fuzzy logic in rsc/source/prj/gui.cxx.
I assumed the precompiler reads this from the left.

Yesterday I've removed BLC, WTC, MTW leftovers from the source - got the
information from there:
http://www.openoffice.org/issues/show_bug.cgi?id=52746

C50 and C52 seem to be Solaris versions. So it's obvious C272 is such a
thing.

Thomas

From ce9dd25c9b5383daa6259a1e328d3409a0b60778 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Thu, 17 Feb 2011 10:21:47 +0100
Subject: [PATCH] Remove TCPP

Seems to be an old compiler
---
 rsc/source/prj/gui.cxx       |    2 +-
 rsc/source/prj/start.cxx     |    4 ++--
 rsc/source/rscpp/cppmain.c   |    4 ----
 svl/inc/svl/svarray.hxx      |   17 -----------------
 tools/source/fsys/wntmsc.hxx |    9 ---------
 5 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx
index ea8a2c3..046da64 100644
--- a/rsc/source/prj/gui.cxx
+++ b/rsc/source/prj/gui.cxx
@@ -43,7 +43,7 @@ static RscCompiler * pRscCompiler = NULL;
 /*                                                                                                 
                            */
 /*     Description :   Gibt die Temporaeren Dateien frei.                      */
 /****************************************************************/
-#if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) || 
defined(__MINGW32__)
+#if defined( UNX ) || defined ( GCC ) || defined(__MINGW32__)
         void ExitProgram( void ){
 #else
 #if defined( CSET )
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index 3cdd32c..a4125f5 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -175,7 +175,7 @@ static BOOL CallPrePro( const ByteString& rPrePro,
         }
     }
 
-#if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2
+#if defined UNX || defined OS2
     nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() );
 #elif defined CSET
     nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() );
@@ -287,7 +287,7 @@ static BOOL CallRsc2( ByteString aRsc2Name,
         printf( "\n" );
     }
 
-#if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2
+#if defined UNX || defined OS2
     nExit = spawnvp( P_WAIT, aRsc2Name.GetBuffer(), (char* const*)aNewCmdL.GetBlock() );
 #elif defined CSET
     nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (char **)(const 
char**)aNewCmdL.GetBlock() );
diff --git a/rsc/source/rscpp/cppmain.c b/rsc/source/rscpp/cppmain.c
index 598fded..667f9e5 100644
--- a/rsc/source/rscpp/cppmain.c
+++ b/rsc/source/rscpp/cppmain.c
@@ -37,10 +37,6 @@ int main( argc, argv )
     int   argc;
     char *argv[];
 {
-#ifdef TSTCPP
-    ( start_cpp( argc, argv ) );
-    puts("erster teil ist fertig" );
-#endif
     return( start_cpp( argc, argv ) );
 }
 
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index bd1deb8..efece4c 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -843,28 +843,11 @@ void nm::Remove( const AE &aE, USHORT nL )\
         nm##_SAR::Remove( nP, nL);\
 }\
 
-#if defined(TCPP)
-
-#define _SORTARR_BLC_CASTS(nm, AE )\
-    BOOL Insert(  AE &aE ) {\
-        return Insert( (const AE&)aE );\
-    }\
-    USHORT GetPos( AE& aE ) const { \
-        return SvPtrarr::GetPos((const VoidPtr&)aE);\
-    }\
-    void Remove( AE& aE, USHORT nL = 1 ) { \
-        Remove( (const AE&) aE, nL     );\
-    }
-
-#else
-
 #define _SORTARR_BLC_CASTS(nm, AE )\
     USHORT GetPos( const AE& aE ) const { \
         return SvPtrarr::GetPos((const VoidPtr&)aE);\
     }
 
-#endif
-
 #define _SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, GS, vis)\
 SV_DECL_PTRARR_VISIBILITY(nm##_SAR, AE, IS, GS, vis)\
 _SORT_CLASS_DEF(nm, AE, IS, GS, vis)\
diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index b4226a7..c2719f5 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -66,15 +66,6 @@
 #define d_name          cFileName
 #define d_type          dwFileAttributes
 
-#if defined (TCPP) || defined (tcpp)
-#define _mkdir          mkdir
-#define _rmdir          rmdir
-#define _chdir          chdir
-#define _unlink         unlink
-#define _getcwd         getcwd
-#define _access         access
-#endif
-
 typedef struct
 {
     _WIN32_FIND_DATAA aDirEnt;
-- 
1.7.3.5