Update of /cvsroot/openvrml/openvrml/lib/antlr/antlr
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2200/antlr
Modified Files:
config.hpp
Removed Files:
Makefile
Log Message:
Committed changes from Antlr 2.7.4 to Antlr 2.7.6.
Index: config.hpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/antlr/antlr/config.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config.hpp 8 Nov 2004 21:14:30 -0000 1.5
--- config.hpp 3 Nov 2006 05:38:18 -0000 1.6
***************
*** 42,46 ****
// _MSC_VER == 1200 for Microsoft Visual C++ 6.0
// _MSC_VER == 1300 for Microsoft Visual C++ 7.0
! #if defined(_MSC_VER) && !defined(__ICL)
// This warning really gets on my nerves.
--- 42,52 ----
// _MSC_VER == 1200 for Microsoft Visual C++ 6.0
// _MSC_VER == 1300 for Microsoft Visual C++ 7.0
! #if defined(_MSC_VER)
!
! # if _MSC_VER < 1300
! # define NOMINMAX
! # pragma warning(disable : 4786)
! # define min _cpp_min
! # endif
// This warning really gets on my nerves.
***************
*** 48,51 ****
--- 54,59 ----
// all the time with STL.
# pragma warning( disable : 4786 4231 )
+ // this shuts up some DLL interface warnings for STL
+ # pragma warning( disable : 4251 )
# ifdef ANTLR_CXX_USE_STLPORT
***************
*** 72,75 ****
--- 80,89 ----
# endif
+ # if ( _MSC_VER < 1200 )
+ // supposedly only for MSVC5 and before...
+ // Using vector<XXX> requires operator<(X,X) to be defined
+ # define NEEDS_OPERATOR_LESS_THAN
+ # endif
+
// VC6
# if ( _MSC_VER == 1200 )
***************
*** 77,91 ****
# endif
! // These should be verified for newer MSVC's
// Not allowed to put 'static const int XXX=20;' in a class definition
! # define NO_STATIC_CONSTS
! // Using vector<XXX> requires operator<(X,X) to be defined
! # define NEEDS_OPERATOR_LESS_THAN
! // No strcasecmp or stricmp in the C library
! # define ANTLR_REALLY_NO_STRCASECMP
! # undef ANTLR_CCTYPE_NEEDS_STD
! // needed for CharScannerLiteralsLess
! # define NO_TEMPLATE_PARTS
#endif // End of Microsoft Visual C++
--- 91,105 ----
# endif
! # if ( _MSC_VER < 1310 )
! // Supposedly only for MSVC7 and before...
// Not allowed to put 'static const int XXX=20;' in a class definition
! # define NO_STATIC_CONSTS
! # define NO_TEMPLATE_PARTS
! # endif
! // No strcasecmp in the C library (so use stricmp instead)
! // - Anyone know which is in which standard?
! # define NO_STRCASECMP
! # undef ANTLR_CCTYPE_NEEDS_STD
#endif // End of Microsoft Visual C++
***************
*** 93,113 ****
/*}}}*/
/******************************************************************************/
-
- // RK: belongs to what compiler?
- #if defined(__ICL)
- # define NO_STRCASECMP
- #endif
-
- /*****************************************************************************/
- /*{{{ Irix Compiler
- *****************************************************************************/
- #if defined(__sgi) && !defined(__GNUC__)
- #define HAS_NOT_CASSERT_H
- #define HAS_NOT_CCTYPE_H
- #define HAS_NOT_CSTRING_H
- #define HAS_NOT_CSTDIO_H
- #endif
-
- /*****************************************************************************/
/*{{{ SunPro Compiler (Using OBJECTSPACE STL)
*****************************************************************************/
--- 107,110 ----
***************
*** 188,193 ****
--- 185,194 ----
// No strcasecmp in the C library (so use stricmp instead)
// - Anyone know which is in which standard?
+ #if (defined(_AIX) && (__IBMCPP__ >= 600))
+ # define NO_STATIC_CONSTS
+ #else
# define NO_STRCASECMP
# undef ANTLR_CCTYPE_NEEDS_STD
+ #endif
#endif // end IBM VisualAge C++
***************
*** 265,268 ****
--- 266,278 ----
/*}}}*/
/*****************************************************************************/
+ #ifdef __BORLANDC__
+ # if __BORLANDC__ >= 560
+ # include <ctype>
+ # include <stdlib>
+ # define ANTLR_CCTYPE_NEEDS_STD
+ # else
+ # error "sorry, compiler is too old - consider an update."
+ # endif
+ #endif
// Redefine these for backwards compatability..
--- Makefile DELETED ---
|
