From 5973f3eb07997c1ae5e7521287d7cdecb5ca5354 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Fri, 16 Sep 2005 12:29:15 +0000
Subject: [PATCH] Have to exclude STLport from some explicit instantiations.

[SVN r31008]
---
 include/boost/regex/v4/instances.hpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/boost/regex/v4/instances.hpp b/include/boost/regex/v4/instances.hpp
index a0a4ee41..4a8d1e64 100644
--- a/include/boost/regex/v4/instances.hpp
+++ b/include/boost/regex/v4/instances.hpp
@@ -119,13 +119,7 @@ template class BOOST_REGEX_DECL ::boost::re_detail::perl_matcher< std::basic_str
 namespace re_detail{
 template BOOST_REGEX_DECL
 std::locale cpp_regex_traits_base<BOOST_REGEX_CHAR_T>::imbue(const std::locale& l);
-/*
-template BOOST_REGEX_DECL
-void cpp_regex_traits_char_layer<BOOST_REGEX_CHAR_T>::init();
-template BOOST_REGEX_DECL
-typename cpp_regex_traits_char_layer<BOOST_REGEX_CHAR_T>::string_type 
-   cpp_regex_traits_char_layer<BOOST_REGEX_CHAR_T>::get_default_message(regex_constants::syntax_type i);
-   */
+
 template BOOST_REGEX_DECL
 cpp_regex_traits_implementation<BOOST_REGEX_CHAR_T>::string_type 
    cpp_regex_traits_implementation<BOOST_REGEX_CHAR_T>::transform_primary(const BOOST_REGEX_CHAR_T* p1, const BOOST_REGEX_CHAR_T* p2) const;
@@ -181,7 +175,10 @@ template BOOST_REGEX_DECL bool perl_matcher<BOOST_REGEX_CHAR_T const *, match_re
 template BOOST_REGEX_DECL bool perl_matcher<BOOST_REGEX_CHAR_T const *, match_results< const BOOST_REGEX_CHAR_T* >::allocator_type BOOST_REGEX_TRAITS_T >::find();
 } // namespace
 
-#if (defined(__GLIBCPP__) || defined(__GLIBCXX__)) && !defined(BOOST_REGEX_ICU_INSTANCES)
+#if (defined(__GLIBCPP__) || defined(__GLIBCXX__)) \
+   && !defined(BOOST_REGEX_ICU_INSTANCES)\
+   && !defined(__SGI_STL_PORT)\
+   && !defined(_STLPORT_VERSION)
 // std:basic_string<>::const_iterator instances as well:
 template BOOST_REGEX_DECL void BOOST_REGEX_CALL 
    match_results<std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator>::maybe_assign(