diff --git a/appendix.htm b/appendix.htm index 0f5455b2..104f0408 100644 --- a/appendix.htm +++ b/appendix.htm @@ -20,7 +20,7 @@

Regex++, Appendices.

-(version 3.01, 18 April 2000) +(version 3.02, 18 April 2000) 
Copyright (c) 1998-2000
 Dr John Maddock
diff --git a/demo/jgrep/gcc.mak b/demo/jgrep/gcc.mak
index 55662a6c..49bd5b68 100644
--- a/demo/jgrep/gcc.mak
+++ b/demo/jgrep/gcc.mak
@@ -8,6 +8,9 @@ CXX= -O2 -I../../../../ -I./
 jgrep : jgrep.cpp main.cpp
 	g++ -ojgrep $(CXX) jgrep.cpp main.cpp -L../../lib/gcc -lregex++
 
+debug : jgrep.cpp main.cpp
+	g++ -ojgrep -I../../../../ -I./ -g jgrep.cpp main.cpp -L../../lib/gcc -lregex++debug
+
 
 
 
diff --git a/demo/jgrep/jgrep.cpp b/demo/jgrep/jgrep.cpp
index ccf65b23..6d601336 100644
--- a/demo/jgrep/jgrep.cpp
+++ b/demo/jgrep/jgrep.cpp
@@ -15,7 +15,7 @@
  
  /*
   *   FILE     jgrep.cpp
-  *   VERSION  3.01
+  *   VERSION  3.02
   */
 
 #include 
diff --git a/demo/jgrep/jgrep.h b/demo/jgrep/jgrep.h
index 7c41521b..97835d5e 100644
--- a/demo/jgrep/jgrep.h
+++ b/demo/jgrep/jgrep.h
@@ -15,7 +15,7 @@
  
  /*
   *   FILE     jgrep.h
-  *   VERSION  3.01
+  *   VERSION  3.02
   */
 
 #ifndef _JGREP_H
diff --git a/demo/jgrep/main.cpp b/demo/jgrep/main.cpp
index 3d838a15..32d664e3 100644
--- a/demo/jgrep/main.cpp
+++ b/demo/jgrep/main.cpp
@@ -15,7 +15,7 @@
  
  /*
   *   FILE     main.cpp
-  *   VERSION  3.01
+  *   VERSION  3.02
   */
 
 
diff --git a/demo/regress/gcc.mak b/demo/regress/gcc.mak
index c62b1b29..2a66584d 100644
--- a/demo/regress/gcc.mak
+++ b/demo/regress/gcc.mak
@@ -3,13 +3,16 @@
 #
 # g++ 2.95 and greater
 #
-CXX= g++ -O2 -pedantic -Wall -I../../../../ -I./ -L../../lib/gcc
+CXX= g++ -pedantic -Wall -I../../../../ -I./ -L../../lib/gcc
 
 total : r2
 	./r2 tests.txt
 
 r2 : tests.cpp parse.cpp regress.cpp
-	$(CXX) -o r2 tests.cpp parse.cpp regress.cpp -lregex++
+	$(CXX) -O2 -o r2 tests.cpp parse.cpp regress.cpp -lregex++
+
+debug : tests.cpp parse.cpp regress.cpp
+	$(CXX) -g -o r2 tests.cpp parse.cpp regress.cpp -lregex++debug
 
 
 
diff --git a/demo/regress/parse.cpp b/demo/regress/parse.cpp
index 918ab897..ef63a717 100644
--- a/demo/regress/parse.cpp
+++ b/demo/regress/parse.cpp
@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     parse.cpp
-  *   VERSION  3.01
+  *   VERSION  3.02
   *
   * Input parsing functions for regress.
   *
diff --git a/demo/regress/regex_test.cpp b/demo/regress/regex_test.cpp
index 328fc707..d93594e0 100644
--- a/demo/regress/regex_test.cpp
+++ b/demo/regress/regex_test.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_test.cpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Builds regression test program with default
   *                locale and narrow character tests.  Also
   *                instantiates all the templates in the library
@@ -54,7 +54,7 @@ regbase::flag_type f = regbase::escape_in_lists | regbase::char_classes | regbas
                        | regbase::bk_parens | regbase::bk_refs | regbase::bk_vbar | regbase::use_except
                        | regbase::failbit | regbase::literal | regbase::icase | regbase::nocollate | regbase::basic
                        | regbase::extended | regbase::normal | regbase::emacs | regbase::awk | regbase::grep | regbase::egrep | regbase::sed;
-
+#if 0
 template class reg_expression;
 template class sub_match;
 template class match_results;
@@ -163,7 +163,7 @@ template test_string_type regex_merge(const test_string_type&,
                                      unsigned int flags);
 
 #endif
-
+#endif
 
 } // namespace boost
 
diff --git a/demo/regress/regress.cpp b/demo/regress/regress.cpp
index 4a052354..ff08804e 100644
--- a/demo/regress/regress.cpp
+++ b/demo/regress/regress.cpp
@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     regress.cpp
-  *   VERSION  3.01
+  *   VERSION  3.02
   *
   * main() and associated code for regress.
   *
diff --git a/demo/regress/regress.h b/demo/regress/regress.h
index f7db5dae..6eee41bc 100644
--- a/demo/regress/regress.h
+++ b/demo/regress/regress.h
@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     regress.h
-  *   VERSION  3.01
+  *   VERSION  3.02
   *
   * Function and data declarations for regress.
   *
diff --git a/demo/regress/tests.cpp b/demo/regress/tests.cpp
index a2f89531..f7ada11a 100644
--- a/demo/regress/tests.cpp
+++ b/demo/regress/tests.cpp
@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     tests.cpp
-  *   VERSION  3.01
+  *   VERSION  3.02
   *
   * the actual tests conducted by regress.
   *
diff --git a/demo/regress/wregex_test.cpp b/demo/regress/wregex_test.cpp
index 951d2e57..26b55553 100644
--- a/demo/regress/wregex_test.cpp
+++ b/demo/regress/wregex_test.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_test.cpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Builds regression test program with default
   *                locale and wide character tests.  Also
   *                instantiates all the templates in the library
diff --git a/demo/timer/gcc.mak b/demo/timer/gcc.mak
index fa1db656..f14253fe 100644
--- a/demo/timer/gcc.mak
+++ b/demo/timer/gcc.mak
@@ -1,18 +1,15 @@
 
 # very basic makefile for timer.exe
 #
-# egcs compiler GCC
+# GNU compiler GCC
 #
-CXX= -O2 -I../../../../ -I./
+CXX=-I../../../../ -I./
 
-timer : regex_timer.o timer.o 
-	g++ -o -L../../lib/gcc timer regex_timer.o timer.o -lregex++
+timer : regex_timer.cpp timer.cpp 
+	g++ $(CXX) -O2 -o timer regex_timer.cpp timer.cpp -L../../lib/gcc -lregex++
 
-timer.o : ../../../timer/timer.cpp
-	g++ -c $(CXX)  ../../../timer/timer.cpp
-
-regex_timer.o : regex_timer.cpp
-	g++ -c $(CXX)  regex_timer.cpp
+debug : regex_timer.cpp timer.cpp 
+	g++ $(CXX) -g -o timer regex_timer.cpp timer.cpp -L../../lib/gcc -lregex++debug
 
 
 
diff --git a/faq.htm b/faq.htm
index e9d8b77c..4b83599b 100644
--- a/faq.htm
+++ b/faq.htm
@@ -20,7 +20,7 @@
 
 Regex++, FAQ.

 
 

-(version 3.01, 18 April 2000)
+(version 3.02, 18 April 2000)
 

 
Copyright (c) 1998-2000
 Dr John Maddock
diff --git a/format_string.htm b/format_string.htm
index 00f9bbe9..f99abd41 100644
--- a/format_string.htm
+++ b/format_string.htm
@@ -20,7 +20,7 @@
 
 Regex++, Format String Reference.

 
 

-(version 3.01, 18 April 2000)
+(version 3.02, 18 April 2000)
 

 
Copyright (c) 1998-2000
 Dr John Maddock
diff --git a/hl_ref.htm b/hl_ref.htm
index 129875e7..04c86ef9 100644
--- a/hl_ref.htm
+++ b/hl_ref.htm
@@ -20,7 +20,7 @@ content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
         
         
Regex++,
         RegEx Class Reference. 

-        
(version 3.01, 18 April 2000) 

+        
(version 3.02, 18 April 2000) 

         
Copyright (c) 1998-2000
 Dr John Maddock
 
diff --git a/include/boost/cregex.hpp b/include/boost/cregex.hpp
index b0b54185..fd8b8869 100644
--- a/include/boost/cregex.hpp
+++ b/include/boost/cregex.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         cregex.cpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Declares POSIX API functions
   *                + boost::RegEx high level wrapper.
   */
diff --git a/include/boost/re_detail/fileiter.hpp b/include/boost/re_detail/fileiter.hpp
index 2c6ec4ce..3e21a23f 100644
--- a/include/boost/re_detail/fileiter.hpp
+++ b/include/boost/re_detail/fileiter.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         fileiter.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Declares various platform independent file and
   *                directory iterators, plus binary file input in
   *                the form of class map_file.
diff --git a/include/boost/re_detail/regex_compile.hpp b/include/boost/re_detail/regex_compile.hpp
index ba559bee..9adf0c5a 100644
--- a/include/boost/re_detail/regex_compile.hpp
+++ b/include/boost/re_detail/regex_compile.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_compile.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Declares reg_expression<> member functions.  This is
   *                an internal header file, do not include directly.
   */
diff --git a/include/boost/re_detail/regex_config.hpp b/include/boost/re_detail/regex_config.hpp
index a943db80..43b226db 100644
--- a/include/boost/re_detail/regex_config.hpp
+++ b/include/boost/re_detail/regex_config.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_config.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: auto-configure options for regular expression code.
   */
 
@@ -46,6 +46,7 @@ Do not change this file unless you really really have to, add options to
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #else
@@ -280,10 +281,16 @@ Do not change this file unless you really really have to, add options to
       #define BOOST_RE_NO_TEMPLATE_SWITCH_MERGE
    #endif
    #define BOOST_RE_NO_CAT
-   #define BOOST_RE_OLD_IOSTREAM
    #define BOOST_RE_NESTED_TEMPLATE_DECL
-   #define BOOST_RE_NO_WCSTRING
    #define BOOST_RE_NO_SWPRINTF
+   #include 
+   #ifdef __BASTRING__
+   	#define BOOST_RE_NO_WCSTRING
+   #endif
+   #if defined(__BEOS__)
+   	#define BOOST_RE_NO_WCTYPE_H
+   	#define BOOST_RE_NO_WCSTRING
+   #endif
 
 #endif
 
@@ -412,7 +419,7 @@ typedef unsigned long jm_uintfast32_t;
        some of these (std)
        may be guesswork: */
 
-      # if !defined (__SGI_STL_OWN_IOSTREAMS) || defined (__STL_HAS_NO_NEW_IOSTREAMS) || defined (__STL_USE_NO_IOSTREAMS)
+      # if !defined (__SGI_STL_OWN_IOSTREAMS) || defined (__STL_HAS_NO_NEW_IOSTREAMS) || defined (__STL_USE_NO_IOSTREAMS) || defined(__STL_NO_MBSTATE_T)
          // Old IO streams:
          #define BOOST_RE_NO_LOCALE_H
          #define BOOST_RE_OLD_IOSTREAM
@@ -421,6 +428,9 @@ typedef unsigned long jm_uintfast32_t;
             #define BOOST_RE_USE_FACET(l, m) (*std::_Use_facet(l))
          #endif
       #endif
+      #ifdef __BASTRING__
+      	#define BOOST_RE_NO_WCSTRING
+      #endif
       #if !defined(__STL_MEMBER_TEMPLATE_CLASSES) ||  !defined(__STL_MEMBER_TEMPLATES)
          #define BOOST_RE_NO_MEMBER_TEMPLATES
       #endif
@@ -1144,10 +1154,6 @@ namespace std{
    using ::strcmp;
    using ::strcpy;
    using ::strlen;
-   using ::swprintf;
-   using ::wcslen;
-   using ::wcscpy;
-   using ::wcscmp;
    using ::isalpha;
    using ::iscntrl;
    using ::isdigit;
@@ -1157,6 +1163,15 @@ namespace std{
    using ::isspace;
    using ::isxdigit;
    using ::tolower;
+   using ::abs;
+   using ::setlocale;
+#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_RE_NO_SWPRINTF
+   using ::swprintf;
+#endif
+   using ::wcslen;
+   using ::wcscpy;
+   using ::wcscmp;
    using ::iswalpha;
    using ::iswcntrl;
    using ::iswdigit;
@@ -1167,7 +1182,12 @@ namespace std{
    using ::iswxdigit;
    using ::towlower;
    using ::wcsxfrm;
+   using ::wcstombs;
+   using ::mbstowcs;
+#ifndef BOOST_RE_NO_LOCALE_H
    using ::mbstate_t;
+#endif
+#endif // BOOST_RE_NO_WCSTRING
 }
 
 #endif
diff --git a/include/boost/re_detail/regex_cstring.hpp b/include/boost/re_detail/regex_cstring.hpp
index ad551a81..03798eaa 100644
--- a/include/boost/re_detail/regex_cstring.hpp
+++ b/include/boost/re_detail/regex_cstring.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_cstring.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: This is an internal header file, do not include directly.
   *                String support and helper functions, for regular
   *                expression library.
diff --git a/include/boost/re_detail/regex_format.hpp b/include/boost/re_detail/regex_format.hpp
index b6fbccd5..cf01d5b4 100644
--- a/include/boost/re_detail/regex_format.hpp
+++ b/include/boost/re_detail/regex_format.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_format.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Provides formatting output routines for search and replace
   *                operations.  Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
@@ -42,7 +42,7 @@ namespace re_detail{
    #if __BORLANDC__ == 0x530
     #pragma option push -a4 -b -Ve
    #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
+    #pragma option push -a8 -b -Ve -w-8037
    #endif
 #endif
 
diff --git a/include/boost/re_detail/regex_kmp.hpp b/include/boost/re_detail/regex_kmp.hpp
index 8a4cf0cf..7269c84e 100644
--- a/include/boost/re_detail/regex_kmp.hpp
+++ b/include/boost/re_detail/regex_kmp.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_kmp.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Provides Knuth Morris Pratt search operations.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/re_detail/regex_library_include.hpp b/include/boost/re_detail/regex_library_include.hpp
index ae3521d7..f1cc463c 100644
--- a/include/boost/re_detail/regex_library_include.hpp
+++ b/include/boost/re_detail/regex_library_include.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_libary_include.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/re_detail/regex_match.hpp b/include/boost/re_detail/regex_match.hpp
index 02ef0824..81836c66 100644
--- a/include/boost/re_detail/regex_match.hpp
+++ b/include/boost/re_detail/regex_match.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_match.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Regular expression matching algorithms.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
@@ -141,7 +141,6 @@ iterator BOOST_RE_CALL re_is_set_member(iterator next,
          }
       }
    }
-
    if(traits_inst.is_class(col, set_->cclasses) == true)
       return set_->isnot ? next : ++next;
    return set_->isnot ? ++next : next;
@@ -1817,3 +1816,4 @@ inline unsigned int regex_grep(bool (*foo)(const match_results */
-#undef BOOST_RE_NO_WCHAR_H
+/* #define BOOST_RE_NO_WCHAR_H */
 
 /* BOOST_RE_NO_WCTYPE_H            If there is no  */
-#undef BOOST_RE_NO_WCTYPE_H
+/* #define BOOST_RE_NO_WCTYPE_H */
 
 /* BOOST_RE_NO_WCSTRING            If there are no wcslen and wcsncmp functions available. */
-#undef BOOST_RE_NO_WCSTRING
+/* #define BOOST_RE_NO_WCSTRING */
 
 /* BOOST_RE_NO_SWPRINTF            If there is no swprintf available. */
-#undef BOOST_RE_NO_SWPRINTF
+/* #define BOOST_RE_NO_SWPRINTF */
 
 /* BOOST_RE_NO_WSPRINTF            If there is no wsprintf available. */
-#undef BOOST_RE_NO_WSPRINTF
+/* #define BOOST_RE_NO_WSPRINTF */
 
 /* BOOST_RE_NO_MEMBER_TEMPLATES    If member function templates or nested template classes are not allowed. */
-#undef BOOST_RE_NO_MEMBER_TEMPLATES
+/* #define BOOST_RE_NO_MEMBER_TEMPLATES */
 
 /* BOOST_RE_NO_TEMPLATE_RETURNS    If template functions based on return type are not supported. */
-#undef BOOST_RE_NO_TEMPLATE_RETURNS
+/* #define BOOST_RE_NO_TEMPLATE_RETURNS */
 
 /* BOOST_RE_NO_PARTIAL_FUNC_SPEC   If partial template function specialisation is not supported */
-#undef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+/* #define BOOST_RE_NO_PARTIAL_FUNC_SPEC */
 
 /* BOOST_RE_NO_INT64               If 64bit integers are not supported. */
 /* BOOST_RE_INT64t                 The type of a 64-bit signed integer if available. */
@@ -69,80 +69,80 @@
                       4 = int64_t
                       5 = long long
                       6 = __int64 */
-#undef BOOST_RE_INT64_T_0
-#undef BOOST_RE_INT64_T_1
-#undef BOOST_RE_INT64_T_2
-#undef BOOST_RE_INT64_T_3
-#undef BOOST_RE_INT64_T_4
-#undef BOOST_RE_INT64_T_5
-#undef BOOST_RE_INT64_T_6
+/* #define BOOST_RE_INT64_T_0 */
+/* #define BOOST_RE_INT64_T_1 */
+/* #define BOOST_RE_INT64_T_2 */
+/* #define BOOST_RE_INT64_T_3 */
+/* #define BOOST_RE_INT64_T_4 */
+/* #define BOOST_RE_INT64_T_5 */
+/* #define BOOST_RE_INT64_T_6 */
 
 /* BOOST_RE_NO_CAT                 Define if the compiler does not support POSIX style
                              message categories (catopen catgets catclose). */
-#undef BOOST_RE_NO_CAT
+/* #define BOOST_RE_NO_CAT */
 
 /* BOOST_RE_THREADS                Define if the compiler supports multiple threads in
                              the current translation mode. */
-#undef BOOST_RE_THREADS
+/* #define BOOST_RE_THREADS */
 
 /* BOOST_RE_NESTED_TEMPLATE_DECL   Defaults to template, the standard prefix when accessing
                              nested template classes, can be redefined to nothing if
                              the compiler does not support this. */
-#undef BOOST_RE_NESTED_TEMPLATE_DECL
+/* #define BOOST_RE_NESTED_TEMPLATE_DECL */
 
 /* BOOST_RE_NO_TEMPLATE_INST       If explicit template instantiation with the "template class X"
                              syntax is not supported */
-#undef BOOST_RE_NO_TEMPLATE_INST
+/* #define BOOST_RE_NO_TEMPLATE_INST */
 
 /* BOOST_RE_NO_TEMPLATE_MERGE      If template in separate translation units don't merge at link time */
-#undef BOOST_RE_NO_TEMPLATE_MERGE
+/* #define BOOST_RE_NO_TEMPLATE_MERGE */
 
 /* BOOST_RE_NO_TEMPLATE_MERGE_A    If template merging from library archives is not supported */
-#undef BOOST_RE_NO_TEMPLATE_MERGE_A
+/* #define BOOST_RE_NO_TEMPLATE_MERGE_A */
 
 /* BOOST_RE_NO_TEMPLATE_SWITCH_MERGE If merging of templates containing switch statements is not supported */
-#undef BOOST_RE_NO_TEMPLATE_SWITCH_MERGE
+/* #define BOOST_RE_NO_TEMPLATE_SWITCH_MERGE */
 
 /* BOOST_RE_CALL                   Optionally define a calling convention for C++ functions */
-#undef BOOST_RE_CALL
+/* #define BOOST_RE_CALL */
 
 /* BOOST_RE_CCALL                  Optionally define a calling convention for C functions */
-#undef BOOST_RE_CCALL
+/* #define BOOST_RE_CCALL */
 
 /* BOOST_RE_SIZEOF_SHORT           sizeof(short) */
-#undef BOOST_RE_SIZEOF_SHORT
+/* #define BOOST_RE_SIZEOF_SHORT */
 
 /* BOOST_RE_SIZEOF_INT             sizeof(int) */
-#undef BOOST_RE_SIZEOF_INT
+/* #define BOOST_RE_SIZEOF_INT */
 
 /* BOOST_RE_SIZEOF_LONG            sizeof(long) */
-#undef BOOST_RE_SIZEOF_LONG
+/* #define BOOST_RE_SIZEOF_LONG */
 
 /* BOOST_RE_SIZEOF_WCHAR_T         sizeof(wchar_t) */
-#undef BOOST_RE_SIZEOF_WCHAR_T
+/* #define BOOST_RE_SIZEOF_WCHAR_T */
 
 
 /* STL options: */
 
 /* BOOST_RE_NO_EXCEPTION_H         Define if you do not a compliant 
                              header file. */
-#undef BOOST_RE_NO_EXCEPTION_H
+/* #define BOOST_RE_NO_EXCEPTION_H */
 
 /* BOOST_RE_NO_ITERATOR_H          Define if you do not have a version of . */
-#undef BOOST_RE_NO_ITERATOR_H
+/* #define BOOST_RE_NO_ITERATOR_H */
 
 /* BOOST_RE_NO_MEMORY_H            Define if  does not fully comply with the
                              latest standard, and is not auto-recognised,
                              that means nested template classes
                              which hardly any compilers support at present. */
-#undef BOOST_RE_NO_MEMORY_H
+/* #define BOOST_RE_NO_MEMORY_H */
 
 /* BOOST_RE_NO_LOCALE_H            Define if there is no verion of the standard
                               header available. */
-#undef BOOST_RE_NO_LOCALE_H
+/* #define BOOST_RE_NO_LOCALE_H */
 
 /* BOOST_RE_NO_STL                 Disables the use of any supporting STL code. */
-#undef BOOST_RE_NO_STL
+/* #define BOOST_RE_NO_STL */
 
 /* BOOST_RE_NO_NOT_EQUAL           Disables the generation of operator!= if this
                              clashes with the STL version. */
@@ -150,39 +150,39 @@
 /* BOOST_RE_NO_STRING_DEF_ARGS     Define if std::basic_string not allowed - in
                              other words if the template is missing its required
                       default arguments. */
-#undef BOOST_RE_NO_STRING_DEF_ARGS
+/* #define BOOST_RE_NO_STRING_DEF_ARGS */
 
 /* BOOST_RE_USE_ALGO               If  not  is present */
-#undef BOOST_RE_USE_ALGO
+/* #define BOOST_RE_USE_ALGO */
 
 /* BOOST_RE_OLD_IOSTREAM           If the new iostreamm classes are not available */
-#undef BOOST_RE_OLD_IOSTREAM
+/* #define BOOST_RE_OLD_IOSTREAM */
 
 /* BOOST_RE_DISTANCE_T             For std::distance:
                              0 = NA
                       1 = std::distance(i, j, n)
                       2 = n = std::distance(i, j) */
-#undef BOOST_RE_DISTANCE_T_0
-#undef BOOST_RE_DISTANCE_T_1
-#undef BOOST_RE_DISTANCE_T_2
+/* #define BOOST_RE_DISTANCE_T_0 */
+/* #define BOOST_RE_DISTANCE_T_1 */
+/* #define BOOST_RE_DISTANCE_T_2 */
 
 /* BOOST_RE_ITERATOR_T             Defines generic standard iterator type if available, use this as
                              a shortcut to define all the other iterator types.
                              1 = std::iterator
                       2 = std::iterator */
-#undef BOOST_RE_ITERATOR_T_0
-#undef BOOST_RE_ITERATOR_T_1
-#undef BOOST_RE_ITERATOR_T_2
+/* #define BOOST_RE_ITERATOR_T_0 */
+/* #define BOOST_RE_ITERATOR_T_1 */
+/* #define BOOST_RE_ITERATOR_T_2 */
 
 /* BOOST_RE_OI_T                   For output iterators:
                              0 = NA
                       1 = std::iterator
                       2 = std::iterator
                       3 = std::output_iterator */
-#undef BOOST_RE_OI_T_0
-#undef BOOST_RE_OI_T_1
-#undef BOOST_RE_OI_T_2
-#undef BOOST_RE_OI_T_3
+/* #define BOOST_RE_OI_T_0 */
+/* #define BOOST_RE_OI_T_1 */
+/* #define BOOST_RE_OI_T_2 */
+/* #define BOOST_RE_OI_T_3 */
 
 /* BOOST_RE_II_T                   For input iterators:
                              0 = NA
@@ -190,11 +190,11 @@
                       2 = std::iterator
                       3 = std::input_iterator
                       4 = std::input_iterator */
-#undef BOOST_RE_II_T_0
-#undef BOOST_RE_II_T_1
-#undef BOOST_RE_II_T_2
-#undef BOOST_RE_II_T_3
-#undef BOOST_RE_II_T_4
+/* #define BOOST_RE_II_T_0 */
+/* #define BOOST_RE_II_T_1 */
+/* #define BOOST_RE_II_T_2 */
+/* #define BOOST_RE_II_T_3 */
+/* #define BOOST_RE_II_T_4 */
 
 
 /* BOOST_RE_FI_T                   For forward iterators:
@@ -202,34 +202,34 @@
                       1 = std::iterator
                       2 = std::iterator
                       3 = std::forward_iterator */
-#undef BOOST_RE_FI_T_0
-#undef BOOST_RE_FI_T_1
-#undef BOOST_RE_FI_T_2
-#undef BOOST_RE_FI_T_3
+/* #define BOOST_RE_FI_T_0 */
+/* #define BOOST_RE_FI_T_1 */
+/* #define BOOST_RE_FI_T_2 */
+/* #define BOOST_RE_FI_T_3 */
 
 /* BOOST_RE_BI_T                   For bidirectional iterators:
                              0 = NA
                       1 = std::iterator
                       2 = std::iterator
                       3 = std::bidirectional_iterator */
-#undef BOOST_RE_BI_T_0
-#undef BOOST_RE_BI_T_1
-#undef BOOST_RE_BI_T_2
-#undef BOOST_RE_BI_T_3
+/* #define BOOST_RE_BI_T_0 */
+/* #define BOOST_RE_BI_T_1 */
+/* #define BOOST_RE_BI_T_2 */
+/* #define BOOST_RE_BI_T_3 */
 
 /* BOOST_RE_RI_T                   For random access iterators:
                              0 = NA
                              1 = std::iterator
                       2 = std::iterator
                       3 = std::random_access_iterator */
-#undef BOOST_RE_RI_T_0
-#undef BOOST_RE_RI_T_1
-#undef BOOST_RE_RI_T_2
-#undef BOOST_RE_RI_T_3
+/* #define BOOST_RE_RI_T_0 */
+/* #define BOOST_RE_RI_T_1 */
+/* #define BOOST_RE_RI_T_2 */
+/* #define BOOST_RE_RI_T_3 */
 
 /* BOOST_RE_NO_OI_ASSIGN           If output iterators ostream_iterator<>, back_insert_iterator<> and 
                              front_insert_iterator<> do not have assignment operators */
-#undef BOOST_RE_NO_OI_ASSIGN
+/* #define BOOST_RE_NO_OI_ASSIGN */
 
 
 #ifdef BOOST_RE_INT64_T_0
diff --git a/include/boost/re_detail/regex_raw_buffer.hpp b/include/boost/re_detail/regex_raw_buffer.hpp
index 2bf4f1d3..4118cfac 100644
--- a/include/boost/re_detail/regex_raw_buffer.hpp
+++ b/include/boost/re_detail/regex_raw_buffer.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_raw_buffer.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Raw character buffer for regex code.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/re_detail/regex_split.hpp b/include/boost/re_detail/regex_split.hpp
index 321c5820..e4f49cdb 100644
--- a/include/boost/re_detail/regex_split.hpp
+++ b/include/boost/re_detail/regex_split.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_split.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Implements regex_split and associated functions.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/re_detail/regex_stack.hpp b/include/boost/re_detail/regex_stack.hpp
index 9e8379bd..b7332db8 100644
--- a/include/boost/re_detail/regex_stack.hpp
+++ b/include/boost/re_detail/regex_stack.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_stack.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Implements customised internal regex stacks.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/re_detail/regex_synch.hpp b/include/boost/re_detail/regex_synch.hpp
index 3f30eeaa..3626e5c1 100644
--- a/include/boost/re_detail/regex_synch.hpp
+++ b/include/boost/re_detail/regex_synch.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_synch.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Thread synchronisation for regex code.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/regex.h b/include/boost/regex.h
index af64f18e..577a7704 100644
--- a/include/boost/regex.h
+++ b/include/boost/regex.h
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex.h
-  *   VERSION      3.00
+  *   VERSION      3.02
   *   DESCRIPTION: Declares POSIX API functions
   */
 
diff --git a/include/boost/regex.hpp b/include/boost/regex.hpp
index ea2a4b2d..1da96a8c 100644
--- a/include/boost/regex.hpp
+++ b/include/boost/regex.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex.cpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Declares boost::reg_expression<> and associated
   *                functions and classes. This header is the main
   *                entry point for the template regex code.
diff --git a/include/boost/regex_traits.hpp b/include/boost/regex_traits.hpp
index b8638173..1efb7f62 100644
--- a/include/boost/regex_traits.hpp
+++ b/include/boost/regex_traits.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex.cpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Declares regular expression traits classes.
   */
 
diff --git a/index.htm b/index.htm
index f5694ef5..18d056c8 100644
--- a/index.htm
+++ b/index.htm
@@ -23,7 +23,7 @@ content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
         
         
Regex++,
         Index.

-        
(version 3.01, 18 April 2000) 

+        
(version 3.02, 18 April 2000) 

         
Copyright (c) 1998-2000
 Dr John Maddock
 
diff --git a/introduction.htm b/introduction.htm
index 36b885dd..d3ca3da4 100644
--- a/introduction.htm
+++ b/introduction.htm
@@ -14,7 +14,7 @@
 
C++ Boost

 
 
Regex++, Introduction.

-
(version 3.01, 18 April 2000) 

+
(version 3.02, 18 April 2000) 

 
Copyright (c) 1998-2000
 Dr John Maddock
 
@@ -82,7 +82,7 @@ std::string human_readable_card_number(const std::string s)
 
The POSIX API functions: regcomp, regexec, regfree and regerror, are available in both narrow character and Unicode versions, and are provided for those who need compatibility with these API's. 

 
Finally, note that the library now has run-time localization support, and recognizes the full POSIX regular expression syntax - including advanced features like multi-character collating elements and equivalence classes - as well as providing compatibility with other regular expression libraries including GNU and BSD4 regex packages, and to a more limited extent perl 5. 

 
Installation and Configuration Options 

-
[ Important: If you are upgrading from version 2.x of this library then you will find a number of changes to the documented header names and library interfaces, existing code should still compile unchanged however - see Note for Upgraders. ]

+
[ Important: If you are upgrading from version 3.02x of this library then you will find a number of changes to the documented header names and library interfaces, existing code should still compile unchanged however - see Note for Upgraders. ]

 
When you extract the library from its zip file, you must preserve its internal directory structure (for example by using the -d option when extracting). If you didn't do that when extracting, then you'd better stop reading this, delete the files you just extracted, and try again! 

 
Currently the library will automatically detect and configure itself for Borland, Microsoft and gcc compilers only. The library will also detect the HP, SGI, Rogue Wave, or Microsoft STL implementations. If the STL type is detected, then the library will attempt to extract suitable compiler configuration options from the STL used. Otherwise the library will assume that the compiler is fully compliant with the C++ standard: unless various options are defined to depreciate features not implemented by your compiler. These options are documented in <boost/re_detail/regex_options.hpp>, if you want to add permanent configuration options add them to <boost/re_detail/regex_options.hpp> which is provided for this purpose - this will allow you to keep your configuration options between library versions by retaining <boost/re_detail/regex_options.hpp>. 

 
The library will encase all code inside namespace boost. 

diff --git a/lib/bc55.mak b/lib/bc55.mak
index 7b5d2884..952882df 100644
--- a/lib/bc55.mak
+++ b/lib/bc55.mak
@@ -345,4 +345,3 @@ bcb5\bcb5re300l.lib : bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex
 |
 	implib -c bcb5\bcb5re300l.lib bcb5\bcb5re300l.dll
 
-
diff --git a/lib/gcc.mak b/lib/gcc.mak
index ad838232..83cf97bf 100644
--- a/lib/gcc.mak
+++ b/lib/gcc.mak
@@ -9,17 +9,16 @@
 #
 
 #
-# Add additional compiler options here:
+# compiler options for release build:
 #
-XCFLAGS=
+C1=-c -O2 -I../../../
 #
-# add additional linker flags here:
+# compiler options for debug build:
 #
-XLFLAGS=
+C2=-c -g -I../../../
 #
-# add additional static-library creation flags here:
-#
-XSFLAGS=
+# compiler options for link:
+LINK=
 
 
 
@@ -42,37 +41,37 @@ install : all
 #
 ########################################################
 gcc/regex++/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/c_regex_traits.o -c -O2 -I../../../ $(XCFLAGS) ../src/c_regex_traits.cpp
+	g++ -o gcc/regex++/c_regex_traits.o $(C1) $(XCFLAGS) ../src/c_regex_traits.cpp
 
 gcc/regex++/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/c_regex_traits_common.o -c -O2 -I../../../ $(XCFLAGS) ../src/c_regex_traits_common.cpp
+	g++ -o gcc/regex++/c_regex_traits_common.o $(C1) $(XCFLAGS) ../src/c_regex_traits_common.cpp
 
 gcc/regex++/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/cpp_regex_traits.o -c -O2 -I../../../ $(XCFLAGS) ../src/cpp_regex_traits.cpp
+	g++ -o gcc/regex++/cpp_regex_traits.o $(C1) $(XCFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/regex++/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/cregex.o -c -O2 -I../../../ $(XCFLAGS) ../src/cregex.cpp
+	g++ -o gcc/regex++/cregex.o $(C1) $(XCFLAGS) ../src/cregex.cpp
 
 gcc/regex++/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/fileiter.o -c -O2 -I../../../ $(XCFLAGS) ../src/fileiter.cpp
+	g++ -o gcc/regex++/fileiter.o $(C1) $(XCFLAGS) ../src/fileiter.cpp
 
 gcc/regex++/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/posix_api.o -c -O2 -I../../../ $(XCFLAGS) ../src/posix_api.cpp
+	g++ -o gcc/regex++/posix_api.o $(C1) $(XCFLAGS) ../src/posix_api.cpp
 
 gcc/regex++/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/regex.o -c -O2 -I../../../ $(XCFLAGS) ../src/regex.cpp
+	g++ -o gcc/regex++/regex.o $(C1) $(XCFLAGS) ../src/regex.cpp
 
 gcc/regex++/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/regex_debug.o -c -O2 -I../../../ $(XCFLAGS) ../src/regex_debug.cpp
+	g++ -o gcc/regex++/regex_debug.o $(C1) $(XCFLAGS) ../src/regex_debug.cpp
 
 gcc/regex++/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/regex_synch.o -c -O2 -I../../../ $(XCFLAGS) ../src/regex_synch.cpp
+	g++ -o gcc/regex++/regex_synch.o $(C1) $(XCFLAGS) ../src/regex_synch.cpp
 
 gcc/regex++/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/w32_regex_traits.o -c -O2 -I../../../ $(XCFLAGS) ../src/w32_regex_traits.cpp
+	g++ -o gcc/regex++/w32_regex_traits.o $(C1) $(XCFLAGS) ../src/w32_regex_traits.cpp
 
 gcc/regex++/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/wide_posix_api.o -c -O2 -I../../../ $(XCFLAGS) ../src/wide_posix_api.cpp
+	g++ -o gcc/regex++/wide_posix_api.o $(C1) $(XCFLAGS) ../src/wide_posix_api.cpp
 
 gcc/regex++ : 
 	mkdir -p gcc/regex++
@@ -81,7 +80,7 @@ regex++_clean :
 	rm -f gcc/regex++/*.o
 
 ./gcc/libregex++.a : gcc/regex++/c_regex_traits.o gcc/regex++/c_regex_traits_common.o gcc/regex++/cpp_regex_traits.o gcc/regex++/cregex.o gcc/regex++/fileiter.o gcc/regex++/posix_api.o gcc/regex++/regex.o gcc/regex++/regex_debug.o gcc/regex++/regex_synch.o gcc/regex++/w32_regex_traits.o gcc/regex++/wide_posix_api.o
-	ar -r $(XSFLAGS) gcc/libregex++.a  gcc/regex++/c_regex_traits.o gcc/regex++/c_regex_traits_common.o gcc/regex++/cpp_regex_traits.o gcc/regex++/cregex.o gcc/regex++/fileiter.o gcc/regex++/posix_api.o gcc/regex++/regex.o gcc/regex++/regex_debug.o gcc/regex++/regex_synch.o gcc/regex++/w32_regex_traits.o gcc/regex++/wide_posix_api.o
+	ar -r $(LINK) gcc/libregex++.a  gcc/regex++/c_regex_traits.o gcc/regex++/c_regex_traits_common.o gcc/regex++/cpp_regex_traits.o gcc/regex++/cregex.o gcc/regex++/fileiter.o gcc/regex++/posix_api.o gcc/regex++/regex.o gcc/regex++/regex_debug.o gcc/regex++/regex_synch.o gcc/regex++/w32_regex_traits.o gcc/regex++/wide_posix_api.o
 
 ########################################################
 #
@@ -89,37 +88,37 @@ regex++_clean :
 #
 ########################################################
 gcc/regex++debug/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/c_regex_traits.o -c -I../../../ -g $(XCFLAGS) ../src/c_regex_traits.cpp
+	g++ -o gcc/regex++debug/c_regex_traits.o $(C2) $(XCFLAGS) ../src/c_regex_traits.cpp
 
 gcc/regex++debug/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/c_regex_traits_common.o -c -I../../../ -g $(XCFLAGS) ../src/c_regex_traits_common.cpp
+	g++ -o gcc/regex++debug/c_regex_traits_common.o $(C2) $(XCFLAGS) ../src/c_regex_traits_common.cpp
 
 gcc/regex++debug/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/cpp_regex_traits.o -c -I../../../ -g $(XCFLAGS) ../src/cpp_regex_traits.cpp
+	g++ -o gcc/regex++debug/cpp_regex_traits.o $(C2) $(XCFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/regex++debug/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/cregex.o -c -I../../../ -g $(XCFLAGS) ../src/cregex.cpp
+	g++ -o gcc/regex++debug/cregex.o $(C2) $(XCFLAGS) ../src/cregex.cpp
 
 gcc/regex++debug/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/fileiter.o -c -I../../../ -g $(XCFLAGS) ../src/fileiter.cpp
+	g++ -o gcc/regex++debug/fileiter.o $(C2) $(XCFLAGS) ../src/fileiter.cpp
 
 gcc/regex++debug/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/posix_api.o -c -I../../../ -g $(XCFLAGS) ../src/posix_api.cpp
+	g++ -o gcc/regex++debug/posix_api.o $(C2) $(XCFLAGS) ../src/posix_api.cpp
 
 gcc/regex++debug/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/regex.o -c -I../../../ -g $(XCFLAGS) ../src/regex.cpp
+	g++ -o gcc/regex++debug/regex.o $(C2) $(XCFLAGS) ../src/regex.cpp
 
 gcc/regex++debug/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/regex_debug.o -c -I../../../ -g $(XCFLAGS) ../src/regex_debug.cpp
+	g++ -o gcc/regex++debug/regex_debug.o $(C2) $(XCFLAGS) ../src/regex_debug.cpp
 
 gcc/regex++debug/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/regex_synch.o -c -I../../../ -g $(XCFLAGS) ../src/regex_synch.cpp
+	g++ -o gcc/regex++debug/regex_synch.o $(C2) $(XCFLAGS) ../src/regex_synch.cpp
 
 gcc/regex++debug/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/w32_regex_traits.o -c -I../../../ -g $(XCFLAGS) ../src/w32_regex_traits.cpp
+	g++ -o gcc/regex++debug/w32_regex_traits.o $(C2) $(XCFLAGS) ../src/w32_regex_traits.cpp
 
 gcc/regex++debug/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/wide_posix_api.o -c -I../../../ -g $(XCFLAGS) ../src/wide_posix_api.cpp
+	g++ -o gcc/regex++debug/wide_posix_api.o $(C2) $(XCFLAGS) ../src/wide_posix_api.cpp
 
 gcc/regex++debug : 
 	mkdir -p gcc/regex++debug
@@ -128,5 +127,7 @@ regex++debug_clean :
 	rm -f gcc/regex++debug/*.o
 
 ./gcc/libregex++debug.a : gcc/regex++debug/c_regex_traits.o gcc/regex++debug/c_regex_traits_common.o gcc/regex++debug/cpp_regex_traits.o gcc/regex++debug/cregex.o gcc/regex++debug/fileiter.o gcc/regex++debug/posix_api.o gcc/regex++debug/regex.o gcc/regex++debug/regex_debug.o gcc/regex++debug/regex_synch.o gcc/regex++debug/w32_regex_traits.o gcc/regex++debug/wide_posix_api.o
-	ar -r $(XSFLAGS) gcc/libregex++debug.a  gcc/regex++debug/c_regex_traits.o gcc/regex++debug/c_regex_traits_common.o gcc/regex++debug/cpp_regex_traits.o gcc/regex++debug/cregex.o gcc/regex++debug/fileiter.o gcc/regex++debug/posix_api.o gcc/regex++debug/regex.o gcc/regex++debug/regex_debug.o gcc/regex++debug/regex_synch.o gcc/regex++debug/w32_regex_traits.o gcc/regex++debug/wide_posix_api.o
+	ar -r $(LINK) gcc/libregex++debug.a  gcc/regex++debug/c_regex_traits.o gcc/regex++debug/c_regex_traits_common.o gcc/regex++debug/cpp_regex_traits.o gcc/regex++debug/cregex.o gcc/regex++debug/fileiter.o gcc/regex++debug/posix_api.o gcc/regex++debug/regex.o gcc/regex++debug/regex_debug.o gcc/regex++debug/regex_synch.o gcc/regex++debug/w32_regex_traits.o gcc/regex++debug/wide_posix_api.o
+
+
 
diff --git a/makefile_gen b/makefile_gen
index 3c565b6a..d7f0f5b9 100644
--- a/makefile_gen
+++ b/makefile_gen
@@ -223,9 +223,15 @@ EOF
 #
 ###############################################################
 
+gcc_shared="no"
+
 function gcc_gen_lib()
 {
-	all_dep="$all_dep $subdir $subdir/$libname ./$subdir/lib$libname.a"
+          if test "$gcc_shared" == "yes"; then
+		all_dep="$all_dep $subdir $subdir/$libname ./$subdir/lib$libname.so"
+	else
+		all_dep="$all_dep $subdir $subdir/$libname ./$subdir/lib$libname.a"
+	fi
 #
 # set up section comments:
 	cat >> $tout << EOF
@@ -260,8 +266,13 @@ EOF
 	echo "" >> $tout
 #
 #	 now for the main target for this library:
-	echo ./$subdir/lib$libname.a : $all_obj >> $tout
-	echo "	ar -r \$(XSFLAGS) $subdir/lib$libname.a $all_obj" >> $tout
+          if test "$gcc_shared" == "yes"; then
+		echo ./$subdir/lib$libname.so : $all_obj >> $tout
+		echo "	\$(LINKER) \$(LINK) -o $subdir/lib$libname.so $all_obj" >> $tout
+	else
+		echo ./$subdir/lib$libname.a : $all_obj >> $tout
+		echo "	ar -r \$(LINK) $subdir/lib$libname.a $all_obj" >> $tout
+	fi
 	echo "" >> $tout
 }
 
@@ -278,10 +289,10 @@ function gcc_gen()
 	echo > $iout
 
 	libname="regex++"
-	opts="-c -O2 -I../../../"
+	opts="\$(C1)"
 	gcc_gen_lib
 	libname="regex++debug"
-	opts="-c -I../../../ -g"
+	opts="\$(C2)"
 	gcc_gen_lib
 	
 	
@@ -297,17 +308,80 @@ function gcc_gen()
 #
 
 #
-# Add additional compiler options here:
+# compiler options for release build:
 #
-XCFLAGS=
+C1=-c -O2 -I../../../
 #
-# add additional linker flags here:
+# compiler options for debug build:
 #
-XLFLAGS=
+C2=-c -g -I../../../
 #
-# add additional static-library creation flags here:
+# compiler options for link:
+LINK=
+
+
+EOF
+	echo "" >> $out
+	echo "ALL_HEADER=$header" >> $out
+	echo "" >> $out
+	echo "all : $subdir $all_dep" >> $out
+	echo >> $out
+	echo "$subdir :" >> $out
+	echo "	mkdir -p $subdir" >> $out
+	echo >> $out
+	echo "clean : $all_clean" >> $out
+	echo >> $out
+	echo "install : all" >> $out
+	cat $iout >> $out
+	echo >> $out
+	cat $tout >> $out
+}
+
+function gcc_gen_shared()
+{
+	out="lib/gcc-shared.mak"
+	tout="temp"
+	iout="temp_install"
+	subdir="gcc"
+	all_dep=""
+	all_clean=""
+	echo > $out
+	echo > $tout
+	echo > $iout
+
+	libname="regex++"
+	opts="\$(C1)"
+	gcc_gen_lib
+	libname="regex++debug"
+	opts="\$(C2)"
+	gcc_gen_lib
+	
+	
+	cat > $out << EOF
 #
-XSFLAGS=
+# auto generated makefile for gcc compiler
+#
+# usage:
+# make
+#   brings libraries up to date
+# make clean
+#   deletes temporary object files (but not archives).
+#
+
+#
+# compiler options for release build:
+#
+C1=-c -O2 -I../../../ -fPIC
+#
+# compiler options for debug build:
+#
+C2=-c -g -I../../../ -fPIC
+#
+# compiler options for link:
+LINK=-shared
+#
+# Linker to use:
+LINKER=ld
 
 
 EOF
@@ -577,6 +651,8 @@ vc6_gen
 #
 # generate gcc makefile:
 gcc_gen
+gcc_shared="yes"
+gcc_gen_shared
 #
 # generate C++ Builder 4 files:
 out="lib/bcb4.mak"
@@ -610,3 +686,6 @@ rm -f $tout $iout
 
 
 
+
+
+
diff --git a/posix_ref.htm b/posix_ref.htm
index 6b5bb075..bedf02c9 100644
--- a/posix_ref.htm
+++ b/posix_ref.htm
@@ -20,7 +20,7 @@
 
 Regex++, POSIX API Reference.

 
 

-(version 3.01, 18 April 2000) 
+(version 3.02, 18 April 2000) 
 

 
Copyright (c) 1998-2000
 Dr John Maddock
diff --git a/src/c_regex_traits.cpp b/src/c_regex_traits.cpp
index 735b55b9..3e5b502d 100644
--- a/src/c_regex_traits.cpp
+++ b/src/c_regex_traits.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         c_regex_traits.cpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Implements the c_regex_traits traits class
   */
 
@@ -37,14 +37,6 @@
 #include 
 #endif
 
-#if defined(BOOST_MSVC)
-namespace std{
-   using ::setlocale;
-   using ::wcstombs;
-   using ::mbstowcs;
-}
-#endif
-
 namespace{
 
 //
diff --git a/src/c_regex_traits_common.cpp b/src/c_regex_traits_common.cpp
index 9f70e020..f7eb6dbb 100644
--- a/src/c_regex_traits_common.cpp
+++ b/src/c_regex_traits_common.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        c_regex_traits_common.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements common code and data for the
   *                c_regex_traits traits classes.
   */
diff --git a/src/cpp_regex_traits.cpp b/src/cpp_regex_traits.cpp
index 89c3428a..2328e037 100644
--- a/src/cpp_regex_traits.cpp
+++ b/src/cpp_regex_traits.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        c_regex_traits.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements the cpp_regex_traits traits class
   */
 #include 
@@ -33,11 +33,6 @@
 
 # ifdef BOOST_MSVC
 #  pragma warning(disable:4786)
-namespace std
-{ 
-   using ::abs; 
-   using ::mbstate_t;
-}
 #  endif
 
 namespace{
diff --git a/src/cregex.cpp b/src/cregex.cpp
index 28be8568..a19de518 100644
--- a/src/cregex.cpp
+++ b/src/cregex.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        cregex.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements high level class boost::RexEx
   */
 #include 
diff --git a/src/fileiter.cpp b/src/fileiter.cpp
index b38855a5..9277b394 100644
--- a/src/fileiter.cpp
+++ b/src/fileiter.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        fileiter.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements file io primitives + directory searching for class boost::RegEx.
   */
 
diff --git a/src/posix_api.cpp b/src/posix_api.cpp
index f3f8170a..acdbf010 100644
--- a/src/posix_api.cpp
+++ b/src/posix_api.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        posix_api.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements the Posix API wrappers.
   */
 
diff --git a/src/primary_transform.hpp b/src/primary_transform.hpp
index 2c3ab363..d9a3bcc3 100644
--- a/src/primary_transform.hpp
+++ b/src/primary_transform.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        primary_transform.hpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Heuristically determines the sort string format in use
   *                by the current locale.
   */
diff --git a/src/regex.cpp b/src/regex.cpp
index 7a1f8321..201800bd 100644
--- a/src/regex.cpp
+++ b/src/regex.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        regex.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Misc boost::regbase member funnctions.
   */
 
diff --git a/src/regex_debug.cpp b/src/regex_debug.cpp
index a127f3ed..2b16981e 100644
--- a/src/regex_debug.cpp
+++ b/src/regex_debug.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        regex_debug.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Misc. debugging helpers.
   */
 
@@ -30,7 +30,11 @@
 #endif
 
 #ifdef BOOST_RE_DEBUG
+#ifndef BOOST_RE_OLD_IOSTREAM
 #include 
+#else 
+#include 
+#endif
 
 namespace boost { namespace re_detail {
 std::ostream& operator<<(std::ostream& s, syntax_element_type x)
diff --git a/src/regex_synch.cpp b/src/regex_synch.cpp
index a2ae33f6..1762fc74 100644
--- a/src/regex_synch.cpp
+++ b/src/regex_synch.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        regex_synch.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Thread synch helper functions, for regular
   *                expression library.
   */
diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp
index 0ddfb833..76d1f3e3 100644
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        w32_regex_traits.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements the w32_regex_traits traits class
   */
 
diff --git a/src/wide_posix_api.cpp b/src/wide_posix_api.cpp
index ae1437ef..ae4321d8 100644
--- a/src/wide_posix_api.cpp
+++ b/src/wide_posix_api.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        wide_posix_api.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements the wide character POSIX API wrappers.
   */
 
diff --git a/syntax.htm b/syntax.htm
index 8a6556c0..1ebbf596 100644
--- a/syntax.htm
+++ b/syntax.htm
@@ -20,7 +20,7 @@
 
 Regex++, Regular Expression Syntax.

 
 

-(version 3.01, 18 April 2000)
+(version 3.02, 18 April 2000)
 

 
Copyright (c) 1998-2000
 Dr John Maddock
diff --git a/template_class_ref.htm b/template_class_ref.htm
index 79ddfa1b..6eeb2e54 100644
--- a/template_class_ref.htm
+++ b/template_class_ref.htm
@@ -21,7 +21,7 @@ content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
         
         
Regex++,
         Template Class and Algorithm Reference.

-        
(version 3.01, 18 April 2000) 

+        
(version 3.02, 18 April 2000) 

         
Copyright (c) 1998-9
 Dr John Maddock
 
diff --git a/traits_class_ref.htm b/traits_class_ref.htm
index 22110ff5..d08358b1 100644
--- a/traits_class_ref.htm
+++ b/traits_class_ref.htm
@@ -19,7 +19,7 @@
 HEIGHT="86" ALT="C++ Boost"> 
 
 
Regex++, Traits Class
-Reference. (version 3.01, 18 April 2000)  

+Reference. (version 3.02, 18 April 2000)  
 
 Copyright (c) 1998-2000
 Dr John Maddock