[Boost-commit] svn:boost r49453 - in sandbox/compile-in-place/Boost_1_35_0: boost/regex/v4 libs/regex/src

Subject: [Boost-commit] svn:boost r49453 - in sandbox/compile-in-place/Boost_1_35_0: boost/regex/v4 libs/regex/src
From: doomster_at_[hidden]
Date: 2008-10-25 19:11:25

Author: eckhardt
Date: 2008-10-25 19:11:24 EDT (Sat, 25 Oct 2008)
New Revision: 49453
URL: http://svn.boost.org/trac/boost/changeset/49453

Log:
- Add guard macros around the enumeration containing various char_class_* constants.

Text files modified: 
   sandbox/compile-in-place/Boost_1_35_0/boost/regex/v4/cpp_regex_traits.hpp |     4 +++-                                    
   sandbox/compile-in-place/Boost_1_35_0/libs/regex/src/c_regex_traits.cpp   |     3 +++                                     
   sandbox/compile-in-place/Boost_1_35_0/libs/regex/src/wc_regex_traits.cpp  |     3 +++                                     
   3 files changed, 9 insertions(+), 1 deletions(-)

Modified: sandbox/compile-in-place/Boost_1_35_0/boost/regex/v4/cpp_regex_traits.hpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/boost/regex/v4/cpp_regex_traits.hpp	(original)
+++ sandbox/compile-in-place/Boost_1_35_0/boost/regex/v4/cpp_regex_traits.hpp	2008-10-25 19:11:24 EDT (Sat, 25 Oct 2008)
@@ -375,6 +375,8 @@
 };
 
 #ifdef BOOST_REGEX_BUGGY_CTYPE_FACET
+#  ifndef CHAR_CLASS_DEFINED
+#  define CHAR_CLASS_DEFINED
 enum
 {
    char_class_space=1<<0, 
@@ -392,7 +394,7 @@
    char_class_word=1<<10,
    char_class_unicode=1<<11
 };
-
+#  endif
 #endif
 
 //

Modified: sandbox/compile-in-place/Boost_1_35_0/libs/regex/src/c_regex_traits.cpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/libs/regex/src/c_regex_traits.cpp	(original)
+++ sandbox/compile-in-place/Boost_1_35_0/libs/regex/src/c_regex_traits.cpp	2008-10-25 19:11:24 EDT (Sat, 25 Oct 2008)
@@ -107,6 +107,8 @@
    return result;
 }
 
+#ifndef CHAR_CLASS_DEFINED
+#define CHAR_CLASS_DEFINED
 enum
 {
    char_class_space=1<<0, 
@@ -124,6 +126,7 @@
    char_class_word=1<<10,
    char_class_unicode=1<<11
 };
+#endif
 
 c_regex_traits<char>::char_class_type BOOST_REGEX_CALL c_regex_traits<char>::lookup_classname(const char* p1, const char* p2)
 {

Modified: sandbox/compile-in-place/Boost_1_35_0/libs/regex/src/wc_regex_traits.cpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_35_0/libs/regex/src/wc_regex_traits.cpp	(original)
+++ sandbox/compile-in-place/Boost_1_35_0/libs/regex/src/wc_regex_traits.cpp	2008-10-25 19:11:24 EDT (Sat, 25 Oct 2008)
@@ -99,6 +99,8 @@
    return result;
 }
 
+#ifndef CHAR_CLASS_DEFINED
+#define CHAR_CLASS_DEFINED
 enum
 {
    char_class_space=1<<0, 
@@ -116,6 +118,7 @@
    char_class_word=1<<10,
    char_class_unicode=1<<11
 };
+#endif
 
 c_regex_traits<wchar_t>::char_class_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::lookup_classname(const wchar_t* p1, const wchar_t* p2) 
 {