diff options
| m--------- | admin | 0 | ||||
| -rw-r--r-- | poxml/antlr/antlr/config.h | 14 | ||||
| -rw-r--r-- | poxml/antlr/src/CharScanner.cpp | 24 | ||||
| -rw-r--r-- | poxml/antlr/src/Parser.cpp | 1 | ||||
| -rw-r--r-- | poxml/antlr/src/String.cpp | 1 | ||||
| -rw-r--r-- | poxml/antlr/src/TreeParser.cpp | 1 | ||||
| -rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/driver.cpp | 1 |
7 files changed, 0 insertions, 42 deletions
diff --git a/admin b/admin -Subproject 85116532467b2bb4c73caf54c106c91a22dbe37 +Subproject 43b0c7bdb9af44dc13b0fd17b95ae172a4a382d diff --git a/poxml/antlr/antlr/config.h b/poxml/antlr/antlr/config.h index 8ac94a3a..6a26ddae 100644 --- a/poxml/antlr/antlr/config.h +++ b/poxml/antlr/antlr/config.h @@ -48,7 +48,6 @@ #define ANTLR_USING_NAMESPACE(_x_) using namespace _x_; #define ANTLR_BEGIN_NAMESPACE(_x_) namespace _x_ { #define ANTLR_END_NAMESPACE } -#define ANTLR_C_USING(_x_) #if defined(_MSC_VER) && !defined(__ICL) // Microsoft Visual C++ @@ -152,17 +151,4 @@ #include <strings.h> #endif -// -// Metrowerks Codewarrior -// -#ifdef __MWERKS__ -#if (__MWERKS__ <= 0x2201) -#define NO_TEMPLATE_PARTS -#define ANTLR_REALLY_NO_STRCASECMP -#endif - -#undef ANTLR_C_USING -#define ANTLR_C_USING(_x_) using std:: ## _x_; -#endif - #endif //INC_config_hpp__ diff --git a/poxml/antlr/src/CharScanner.cpp b/poxml/antlr/src/CharScanner.cpp index 8374651e..bcfb1682 100644 --- a/poxml/antlr/src/CharScanner.cpp +++ b/poxml/antlr/src/CharScanner.cpp @@ -51,30 +51,6 @@ #include <stdlib.h> ANTLR_BEGIN_NAMESPACE(antlr) -ANTLR_C_USING(exit) -ANTLR_C_USING(tolower) - -#ifdef ANTLR_REALLY_NO_STRCASECMP -// Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior -// on the mac has neither... -inline int strcasecmp(const char *s1, const char *s2) -{ - while (true) - { - char c1 = tolower(*s1++), - c2 = tolower(*s2++); - if (c1 < c2) return -1; - if (c1 > c2) return 1; - if (c1 == 0) return 0; - } -} -#else -#ifdef NO_STRCASECMP -ANTLR_C_USING(stricmp) -#else -ANTLR_C_USING(strcasecmp) -#endif -#endif CharScannerLiteralsLess::CharScannerLiteralsLess(const CharScanner* theScanner) : scanner(theScanner) diff --git a/poxml/antlr/src/Parser.cpp b/poxml/antlr/src/Parser.cpp index 115bf228..debe5900 100644 --- a/poxml/antlr/src/Parser.cpp +++ b/poxml/antlr/src/Parser.cpp @@ -40,7 +40,6 @@ #include <stdlib.h> ANTLR_BEGIN_NAMESPACE(antlr) -ANTLR_C_USING(exit) /**A generic ANTLR parser (LL(k) for k>=1) containing a bunch of * utility routines useful at any lookahead depth. We distinguish between diff --git a/poxml/antlr/src/String.cpp b/poxml/antlr/src/String.cpp index 79d8cd27..92a47002 100644 --- a/poxml/antlr/src/String.cpp +++ b/poxml/antlr/src/String.cpp @@ -39,7 +39,6 @@ #endif ANTLR_BEGIN_NAMESPACE(antlr) -ANTLR_C_USING(sprintf) ANTLR_USE_NAMESPACE(std)string operator+(const ANTLR_USE_NAMESPACE(std)string& lhs,int rhs) { diff --git a/poxml/antlr/src/TreeParser.cpp b/poxml/antlr/src/TreeParser.cpp index 1e83bd77..52d8c50d 100644 --- a/poxml/antlr/src/TreeParser.cpp +++ b/poxml/antlr/src/TreeParser.cpp @@ -36,7 +36,6 @@ #include <stdlib.h> ANTLR_BEGIN_NAMESPACE(antlr) -ANTLR_C_USING(exit) TreeParser::TreeParser() : inputState(new TreeParserInputState()), traceDepth(0) diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp index 48dc2d40..17b1b2f7 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp @@ -280,7 +280,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 |