From 64d94606f5302349748dae8d2d8d475be5f4afd3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 31 Dec 2024 16:57:08 +0900 Subject: Remove support for Metrowerks compiler Signed-off-by: Michele Calgaro --- lib/antlr/antlr/CharScanner.h | 8 -------- lib/antlr/antlr/config.h | 20 -------------------- lib/antlr/src/CharScanner.cpp | 1 - lib/antlr/src/String.cpp | 3 --- lib/cppparser/driver.cpp | 1 - 5 files changed, 33 deletions(-) diff --git a/lib/antlr/antlr/CharScanner.h b/lib/antlr/antlr/CharScanner.h index 2e2ffc7c..4a0816a8 100644 --- a/lib/antlr/antlr/CharScanner.h +++ b/lib/antlr/antlr/CharScanner.h @@ -41,8 +41,6 @@ namespace antlr { class ANTLR_API CharScanner; -ANTLR_C_USING(tolower) - #ifdef ANTLR_REALLY_NO_STRCASECMP // Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior // on the mac has neither... @@ -57,12 +55,6 @@ inline int strcasecmp(const char *s1, const char *s2) if (c1 == 0) return 0; } } -#else -#ifdef NO_STRCASECMP -ANTLR_C_USING(stricmp) -#else -ANTLR_C_USING(strcasecmp) -#endif #endif /** Functor for the literals map diff --git a/lib/antlr/antlr/config.h b/lib/antlr/antlr/config.h index 200463b8..9b446c84 100644 --- a/lib/antlr/antlr/config.h +++ b/lib/antlr/antlr/config.h @@ -18,7 +18,6 @@ #define ANTLR_USE_NAMESPACE(_x_) _x_:: #define ANTLR_USING_NAMESPACE(_x_) using namespace _x_; #define ANTLR_CXX_SUPPORTS_NAMESPACE 1 -#define ANTLR_C_USING(_x_) #define ANTLR_API #ifndef CUSTOM_API # define CUSTOM_API @@ -194,25 +193,6 @@ #endif // end IBM VisualAge C++ /*}}}*/ /*****************************************************************************/ -/*{{{ Metrowerks Codewarrior - *****************************************************************************/ -#ifdef __MWERKS__ -# if (__MWERKS__ <= 0x2201) -# define NO_TEMPLATE_PARTS -# endif - -// CW 6.0 and 7.0 still do not have it. -# define ANTLR_REALLY_NO_STRCASECMP - -# undef ANTLR_C_USING -# define ANTLR_C_USING(_x_) using std:: ## _x_; - -# define ANTLR_CCTYPE_NEEDS_STD -# undef ANTLR_CXX_SUPPORTS_UNCAUGHT_EXCEPTION - -#endif // End of Metrowerks Codewarrior -/*}}}*/ -/*****************************************************************************/ /*{{{ SGI Irix 6.5.10 MIPSPro compiler *****************************************************************************/ // (contributed by Anna Winkler) diff --git a/lib/antlr/src/CharScanner.cpp b/lib/antlr/src/CharScanner.cpp index 63545468..ba217983 100644 --- a/lib/antlr/src/CharScanner.cpp +++ b/lib/antlr/src/CharScanner.cpp @@ -13,7 +13,6 @@ #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { #endif -ANTLR_C_USING(exit) CharScanner::CharScanner(InputBuffer& cb, bool case_sensitive ) : saveConsumedInput(true) //, caseSensitiveLiterals(true) diff --git a/lib/antlr/src/String.cpp b/lib/antlr/src/String.cpp index 39b09ab1..4de93c8a 100644 --- a/lib/antlr/src/String.cpp +++ b/lib/antlr/src/String.cpp @@ -19,9 +19,6 @@ namespace antlr { #endif -// RK: should be using snprintf actually... (or stringstream) -ANTLR_C_USING(sprintf) - ANTLR_USE_NAMESPACE(std)string operator+( const ANTLR_USE_NAMESPACE(std)string& lhs, const int rhs ) { char tmp[100]; diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index 07491169..2f3e9ffb 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -552,7 +552,6 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "ANTLR_USE_NAMESPACE", SkipWordAndArguments ); lexer->addSkipWord( "ANTLR_USING_NAMESPACE", SkipWordAndArguments ); lexer->addSkipWord( "ANTLR_END_NAMESPACE" ); - lexer->addSkipWord( "ANTLR_C_USING", SkipWordAndArguments ); lexer->addSkipWord( "ANTLR_API" ); // gnu -- cgit v1.2.1