[Boost-commit] svn:boost r53274 - trunk/boost/regex/v4

Subject: [Boost-commit] svn:boost r53274 - trunk/boost/regex/v4
From: john_at_[hidden]
Date: 2009-05-26 04:31:25

Author: johnmaddock
Date: 2009-05-26 04:31:23 EDT (Tue, 26 May 2009)
New Revision: 53274
URL: http://svn.boost.org/trac/boost/changeset/53274

Log:
GCC warning suppression fixes.
Fixes #3071.
Text files modified: 
   trunk/boost/regex/v4/basic_regex.hpp           |     4 ++++                                    
   trunk/boost/regex/v4/regex_traits_defaults.hpp |    15 +++++++++++++++                         
   2 files changed, 19 insertions(+), 0 deletions(-)

Modified: trunk/boost/regex/v4/basic_regex.hpp
==============================================================================
--- trunk/boost/regex/v4/basic_regex.hpp	(original)
+++ trunk/boost/regex/v4/basic_regex.hpp	2009-05-26 04:31:23 EDT (Tue, 26 May 2009)
@@ -69,6 +69,10 @@
 {
 public:
    virtual int get_id(const charT* i, const charT* j) = 0;
+#ifdef __GNUC__
+   // warning supression:
+   virtual ~named_subexpressions_base(){}
+#endif
 };
 
 template <class charT>

Modified: trunk/boost/regex/v4/regex_traits_defaults.hpp
==============================================================================
--- trunk/boost/regex/v4/regex_traits_defaults.hpp	(original)
+++ trunk/boost/regex/v4/regex_traits_defaults.hpp	2009-05-26 04:31:23 EDT (Tue, 26 May 2009)
@@ -339,6 +339,21 @@
 #endif
 }
 
+template <>
+inline const char* get_escape_R_string<char>()
+{
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable:4309)
+#endif
+   static const char e2[] = { '(', '?', '>', '\x0D', '\x0A', '?', 
+      '|', '[', '\x0A', '\x0B', '\x0C', '\x85', ']', ')', '\0' };
+   return e2;
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
+}
+
 } // re_detail
 } // boost