reorganised regex config setup

[SVN r10064]

test/regress/parse.cpp

@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     parse.cpp
-  *   VERSION  3.10
+  *   VERSION  3.11
   *
   * Input parsing functions for regress.
   *

test/regress/regex_test.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_test.cpp
-  *   VERSION      3.10
+  *   VERSION      3.11
   *   DESCRIPTION: Builds regression test program with default
   *                locale and narrow character tests.  Also
   *                instantiates all the templates in the library

test/regress/regress.cpp

@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     regress.cpp
-  *   VERSION  3.10
+  *   VERSION  3.11
   *
   * main() and associated code for regress.
   *
@@ -39,6 +39,8 @@ using std::endl;
 #pragma hrdstop
 #endif
 
+#include <boost/test/cpp_main.cpp>
+
 #include "regress.h"
 
 #if defined(BOOST_MSVC) && defined(_DEBUG)
@@ -72,7 +74,7 @@ void usage()
 
 }
 
-int main(int argc, char * argv[])
+int cpp_main(int argc, char * argv[])
 {
 #if defined(BOOST_MSVC) && defined(_DEBUG)
    // turn on heap reporting at program exit:
@@ -111,10 +113,6 @@ int main(int argc, char * argv[])
       }
       cout << line << " lines, " << tests << " tests completed in file " << argv[i] << endl;
    }
-   if(error_count)
-      cout << "There were " << error_count << " failures in total..." << endl;
-   else
-      cout << "No failures detected..." << endl;
 
    return error_count;
 }

test/regress/regress.h

@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     regress.h
-  *   VERSION  3.10
+  *   VERSION  3.11
   *
   * Function and data declarations for regress.
   *
@@ -129,7 +129,7 @@ public:
    typedef char         value_type;
 
 
-   #ifndef BOOST_RE_NO_MEMBER_TEMPLATES
+   #ifndef BOOST_NO_MEMBER_TEMPLATES
    template <class U>
    struct rebind
    {
@@ -187,7 +187,7 @@ public:
 // class debug_iterator
 //
 template <class T>
-struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, std::ptrdiff_t)
+struct debug_iterator
 {
    typedef std::ptrdiff_t                    difference_type;
    typedef char_t                            value_type;
@@ -306,16 +306,43 @@ struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, std::ptrdiff_t)
   }
 };
 
-#if defined(__SGI_STL_PORT) && (__SGI_STL_PORT >= 0x400)
+#if defined(__SGI_STL_PORT)
 namespace std{
 template <class T>
 inline random_access_iterator_tag __STL_CALL
+__ITERATOR_CATEGORY(const debug_iterator<T>&) {
+  return random_access_iterator_tag();
+}
+}
+#elif defined(__STL_CONFIG_H)
+namespace std{
+template <class T>
+inline random_access_iterator_tag 
+iterator_category(const debug_iterator<T>&) {
+  return random_access_iterator_tag();
+}
+}
+#endif
+#ifdef BOOST_MSVC
+namespace std{
+template <class T>
+inline random_access_iterator_tag __cdecl
+_Iter_cat(const debug_iterator<T>&) {
+  return random_access_iterator_tag();
+}
+}
+#endif
+#ifdef BOOST_RWSTD_VER
+namespace std{
+template <class T>
+inline random_access_iterator_tag
 __iterator_category(const debug_iterator<T>&) {
   return random_access_iterator_tag();
 }
 }
 #endif
 
+
 #ifdef BOOST_RE_TEST_LOCALE_W32
 typedef boost::reg_expression<char_t, boost::w32_regex_traits<char_t>, jm_debug_alloc> re_type;
 #elif defined(BOOST_RE_TEST_LOCALE_CPP)

test/regress/tests.cpp

@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     tests.cpp
-  *   VERSION  3.10
+  *   VERSION  3.11
   *
   * the actual tests conducted by regress.
   *

test/regress/wregex_test.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_test.cpp
-  *   VERSION      3.10
+  *   VERSION      3.11
   *   DESCRIPTION: Builds regression test program with default
   *                locale and wide character tests.  Also
   *                instantiates all the templates in the library