From 187208adf5adf64dc0a872d811e4ecc827d38253 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Wed, 19 Sep 2001 11:48:51 +0000 Subject: [PATCH] First round of config fixes [SVN r11146] --- include/boost/regex.hpp | 6 +++++- include/boost/regex/config.hpp | 23 +++++++++++++++++++++++ include/boost/regex/pattern_except.hpp | 3 ++- include/boost/regex/regex_traits.hpp | 3 ++- include/boost/regex/user.hpp | 23 +++++++++++++++++++++++ test/regress/regex_test.cpp | 1 + test/regress/regress.h | 4 ++-- test/regress/wregex_test.cpp | 1 + 8 files changed, 59 insertions(+), 5 deletions(-) diff --git a/include/boost/regex.hpp b/include/boost/regex.hpp index 884f6e9e..4b259608 100644 --- a/include/boost/regex.hpp +++ b/include/boost/regex.hpp @@ -434,7 +434,11 @@ struct def_alloc_param_traits } -template ::type) > +template ::type) > class match_results; // diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp index b814a52b..8264dfdf 100644 --- a/include/boost/regex/config.hpp +++ b/include/boost/regex/config.hpp @@ -1,3 +1,24 @@ +/* + * + * Copyright (c) 1998-2000 + * Dr John Maddock + * + * Permission to use, copy, modify, distribute and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation. Dr John Maddock makes no representations + * about the suitability of this software for any purpose. + * It is provided "as is" without express or implied warranty. + * + */ + + /* + * LOCATION: see http://www.boost.org for most recent version. + * FILE config.hpp + * VERSION 3.12 + * DESCRIPTION: regex extended config setup. + */ #ifndef BOOST_REGEX_CONFIG_HPP #define BOOST_REGEX_CONFIG_HPP @@ -503,3 +524,5 @@ inline void construct(T* p, const T& t) #endif + + diff --git a/include/boost/regex/pattern_except.hpp b/include/boost/regex/pattern_except.hpp index aad5c7cb..e07d127b 100644 --- a/include/boost/regex/pattern_except.hpp +++ b/include/boost/regex/pattern_except.hpp @@ -15,7 +15,7 @@ /* * LOCATION: see http://www.boost.org for most recent version. - * FILE pattern_except.cpp + * FILE pattern_except.hpp * VERSION 3.12 * DESCRIPTION: Declares pattern-matching exception classes. */ @@ -53,3 +53,4 @@ public: } // namespace boost #endif + diff --git a/include/boost/regex/regex_traits.hpp b/include/boost/regex/regex_traits.hpp index bca125c9..f28f5030 100644 --- a/include/boost/regex/regex_traits.hpp +++ b/include/boost/regex/regex_traits.hpp @@ -15,7 +15,7 @@ /* * LOCATION: see http://www.boost.org for most recent version. - * FILE regex.cpp + * FILE regex_traits.hpp * VERSION 3.12 * DESCRIPTION: Declares regular expression traits classes. */ @@ -790,3 +790,4 @@ class regex_traits : public cpp_regex_traits #endif // include + diff --git a/include/boost/regex/user.hpp b/include/boost/regex/user.hpp index 1c7404bd..3259fd15 100644 --- a/include/boost/regex/user.hpp +++ b/include/boost/regex/user.hpp @@ -1,3 +1,24 @@ +/* + * + * Copyright (c) 1998-2000 + * Dr John Maddock + * + * Permission to use, copy, modify, distribute and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation. Dr John Maddock makes no representations + * about the suitability of this software for any purpose. + * It is provided "as is" without express or implied warranty. + * + */ + + /* + * LOCATION: see http://www.boost.org for most recent version. + * FILE user.hpp + * VERSION 3.12 + * DESCRIPTION: User settable options. + */ // define if you want the regex library to use the C locale // even on Win32: @@ -25,3 +46,5 @@ // #define BOOST_REGEX_NO_BOOL + + diff --git a/test/regress/regex_test.cpp b/test/regress/regex_test.cpp index 72e8f52c..6870cfdc 100644 --- a/test/regress/regex_test.cpp +++ b/test/regress/regex_test.cpp @@ -25,6 +25,7 @@ // disable automatic selection of support library: #define BOOST_REGEX_NO_LIB +#define BOOST_REGEX_STATIC_LINK #include #include diff --git a/test/regress/regress.h b/test/regress/regress.h index 54710f21..7de46dfa 100644 --- a/test/regress/regress.h +++ b/test/regress/regress.h @@ -126,8 +126,8 @@ public: typedef const T* const_pointer; typedef T& reference; typedef const T& const_reference; - typedef size_t size_type; - typedef ptrdiff_t difference_type; + typedef std::size_t size_type; + typedef std::ptrdiff_t difference_type; typedef Base base_type; allocator_binder(){} diff --git a/test/regress/wregex_test.cpp b/test/regress/wregex_test.cpp index 79a68fd6..d680094a 100644 --- a/test/regress/wregex_test.cpp +++ b/test/regress/wregex_test.cpp @@ -25,6 +25,7 @@ // disable automatic selection of support library: #define BOOST_REGEX_NO_LIB +#define BOOST_REGEX_STATIC_LINK #if defined(_MSC_VER) && defined(__STL_DEBUG) && defined(_DLL) //