[Boost-commit] svn:boost r51490 - sandbox/compile-in-place/Boost_1_36_0/libs/regex/src

Subject: [Boost-commit] svn:boost r51490 - sandbox/compile-in-place/Boost_1_36_0/libs/regex/src
From: doomster_at_[hidden]
Date: 2009-02-28 16:47:23

Author: eckhardt
Date: 2009-02-28 16:47:23 EST (Sat, 28 Feb 2009)
New Revision: 51490
URL: http://svn.boost.org/trac/boost/changeset/51490

Log:
- Protect enumeration with include guards to prevent conflicts.

Text files modified: 
   sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/c_regex_traits.cpp  |     3 +++                                     
   sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/wc_regex_traits.cpp |     3 +++                                     
   2 files changed, 6 insertions(+), 0 deletions(-)

Modified: sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/c_regex_traits.cpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/c_regex_traits.cpp	(original)
+++ sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/c_regex_traits.cpp	2009-02-28 16:47:23 EST (Sat, 28 Feb 2009)
@@ -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_36_0/libs/regex/src/wc_regex_traits.cpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/wc_regex_traits.cpp	(original)
+++ sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/wc_regex_traits.cpp	2009-02-28 16:47:23 EST (Sat, 28 Feb 2009)
@@ -132,6 +132,8 @@
    return result;
 }
 
+#ifndef CHAR_CLASS_DEFINED
+#define CHAR_CLASS_DEFINED
 enum
 {
    char_class_space=1<<0, 
@@ -149,6 +151,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) 
 {