From 160420223c159e7be4f1007f03ccdade2ed1104c Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 24 Aug 2005 09:59:14 +0000
Subject: [PATCH] Disabled support for external templates with Intel 8.0 and
 earlier (it leads to unresolved externals).

[SVN r30643]
---
 doc/Attic/history.html         | 31 +++++++++++++++++--------------
 doc/history.html               | 31 +++++++++++++++++--------------
 include/boost/regex/config.hpp |  8 ++++++++
 3 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/doc/Attic/history.html b/doc/Attic/history.html
index 4ffc9d23..8b7c29e5 100644
--- a/doc/Attic/history.html
+++ b/doc/Attic/history.html
@@ -27,25 +27,28 @@
       <P>Boost 1.33.0 Hotfix</P>
       <UL>
          <LI>
-            Fixed broken makefiles.</LI>
+         Fixed broken makefiles.
          <LI>
-            Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when 
-            using /Zc:wchar_t.</LI>
+         Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when 
+         using /Zc:wchar_t.
          <LI>
-            Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler 
-            can cope.</LI>
+         Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler 
+         can cope.
          <LI>
-            Added missing #includes to fileiter.hpp and cpp_regex_traits.hpp, this is 
-            probably an SGI Irix specific fix.</LI>
+         Added missing #includes to fileiter.hpp and cpp_regex_traits.hpp, this is 
+         probably an SGI Irix specific fix.
          <LI>
-            Fixed a bug where non-greedy repeats could in certain strange curcumstances 
-            repeat more times than their maximum value.</LI>
+         Fixed a bug where non-greedy repeats could in certain strange curcumstances 
+         repeat more times than their maximum value.
          <LI>
-            Fixed the value returned by basic_regex&lt;&gt;::empty() from a default 
-            constructed object.</LI>
+         Fixed the value returned by basic_regex&lt;&gt;::empty() from a default 
+         constructed object.
          <LI>
-            Changed the deffinition of regex_error to make it backwards compatible with 
-            Boost-1.32.0.</LI></UL>
+         Changed the deffinition of regex_error to make it backwards compatible with 
+         Boost-1.32.0.
+         <LI>
+            Disabled external templates for Intel C++ 8.0 and earlier - otherwise 
+            unresolved references can occur.</LI></UL>
       <P>Boost 1.33.0.</P>
       <UL>
          <LI>
@@ -127,7 +130,7 @@
          <HR>
       <P></P>
       <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
+         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
          28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
diff --git a/doc/history.html b/doc/history.html
index 4ffc9d23..8b7c29e5 100644
--- a/doc/history.html
+++ b/doc/history.html
@@ -27,25 +27,28 @@
       <P>Boost 1.33.0 Hotfix</P>
       <UL>
          <LI>
-            Fixed broken makefiles.</LI>
+         Fixed broken makefiles.
          <LI>
-            Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when 
-            using /Zc:wchar_t.</LI>
+         Fixed configuration setup to allow building with VC7.1 - STLport-4.6.2 when 
+         using /Zc:wchar_t.
          <LI>
-            Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler 
-            can cope.</LI>
+         Moved declarations class-inline in static_mutex.hpp so that SGI Irix compiler 
+         can cope.
          <LI>
-            Added missing #includes to fileiter.hpp and cpp_regex_traits.hpp, this is 
-            probably an SGI Irix specific fix.</LI>
+         Added missing #includes to fileiter.hpp and cpp_regex_traits.hpp, this is 
+         probably an SGI Irix specific fix.
          <LI>
-            Fixed a bug where non-greedy repeats could in certain strange curcumstances 
-            repeat more times than their maximum value.</LI>
+         Fixed a bug where non-greedy repeats could in certain strange curcumstances 
+         repeat more times than their maximum value.
          <LI>
-            Fixed the value returned by basic_regex&lt;&gt;::empty() from a default 
-            constructed object.</LI>
+         Fixed the value returned by basic_regex&lt;&gt;::empty() from a default 
+         constructed object.
          <LI>
-            Changed the deffinition of regex_error to make it backwards compatible with 
-            Boost-1.32.0.</LI></UL>
+         Changed the deffinition of regex_error to make it backwards compatible with 
+         Boost-1.32.0.
+         <LI>
+            Disabled external templates for Intel C++ 8.0 and earlier - otherwise 
+            unresolved references can occur.</LI></UL>
       <P>Boost 1.33.0.</P>
       <UL>
          <LI>
@@ -127,7 +130,7 @@
          <HR>
       <P></P>
       <p>Revised&nbsp; 
-         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
+         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
          28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp
index a068b339..3b78bdda 100644
--- a/include/boost/regex/config.hpp
+++ b/include/boost/regex/config.hpp
@@ -79,6 +79,14 @@
 #  define BOOST_REGEX_BUGGY_CTYPE_FACET
 #endif
 
+/*
+ * Intel C++ before 8.0 ends up with unresolved externals unless we turn off
+ * extern template support:
+ */
+#if defined(BOOST_INTEL) && defined(__cplusplus) && (BOOST_INTEL <= 800)
+#  define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
+#endif
+
 /*
  * If there isn't good enough wide character support then there will
  * be no wide character regular expressions: