ChangeLogTag: Sun Dec 2 17:47:13 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com>

3 files changed, 24 insertions, 45 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index d2ae36e6b8a..041ad5193bb 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,17 @@
+Sun Dec  2 17:47:13 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Remove code which defined ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
+          and ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION feature test macros.
+          There are vestigial bits of the tests which still remain -- the
+          entire platform template capability tests need to be rewritten.
+
+        * m4/config_h.m4:
+
+          Remove templates for ACE_HAS_TEMPLATE_INSTANTATION_PRAGMA and
+          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION.
+
 Sun Dec  2 17:43:27 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * ace/README:
diff --git a/ACE/configure.ac b/ACE/configure.ac
index d5111c79492..2ea6f6481c8 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -2490,7 +2490,16 @@ ACE_CACHE_CHECK([if const char * can be rvalue in conditional operator],
   ],,[AC_DEFINE([ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS])])
 
 dnl Check if templates require source on platform
-dnl FIXME:  This test may be broken.
+dnl
+dnl FIXME: This test may be broken.
+dnl
+dnl FIXME: This test contains vestigial bits of tests for explicit
+dnl template instantiation feature macros, even though support for
+dnl the same has been removed. 
+dnl 
+dnl A rewrite to test only whether ACE_TEMPLATES_REQUIRE_SOURCE or
+dnl ACE_TEMPLATES_REQUIRE_PRAGMA is clearly needed.
+dnl
 ACE_CACHE_CHECK([if templates require source],
   [ace_cv_feature_templates_require_source],
   [
@@ -2954,40 +2963,6 @@ dnl END OUTER REQUIRE PRAGMA #########################################
      ])
   ])
 
-ACE_CACHE_CHECK([if explicit template instantiation is needed],
-  [ace_cv_feature_explicit_template_instantiation],
-  [
-   AC_MSG_ERROR([
-Bug in configure script, check for need of explicit template
-instantiation should have occurred during check for need of template
-source.  Please e-mail the maintainer of this configure script:
-  $ACE_CONFIGURE_MAINTAINER
-this message.
-    ])
-  ],
-  [
-   AC_DEFINE([ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION])
-  ],
-  [
-   ACE_CACHE_CHECK([if pragma template instantiation is needed],
-     [ace_cv_feature_pragma_template_instantiation],
-     [
-      AC_MSG_FAILURE([
-Bug in configure script, check for need of pragma template
-instantiation should have occurred during check for need of template
-source.  Please e-mail the maintainer of this configure script:
-  $ACE_CONFIGURE_MAINTAINER
-this message.
-        ])
-     ],
-     [
-      AC_DEFINE([ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA])
-     ],
-     [
-      dnl Do nothing
-     ])
-  ])
-
 
 dnl Check if platform supports template specialization
 ACE_CACHE_CHECK([for template specialization],
diff --git a/ACE/m4/config_h.m4 b/ACE/m4/config_h.m4
index 558ae3431f7..fdf10ac94e7 100644
--- a/ACE/m4/config_h.m4
+++ b/ACE/m4/config_h.m4
@@ -1008,19 +1008,9 @@ AH_TEMPLATE([ACE_TEMPLATES_REQUIRE_SOURCE],
 [Compiler's template mechanim must see source code (i.e., .cpp
    files).  This is used for GNU G++.])
 
-AH_TEMPLATE([ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION],
-[Compiler's template instantiation mechanism supports the use of
-   explicit C++ specializations for all used templates. This is also
-   used for GNU G++ if you don't use the "repo" patches.])
-
 AH_TEMPLATE([ACE_HAS_ICMP_SUPPORT],
 [Defined to 1 if platform supports ICMP over raw sockets])
 
-AH_TEMPLATE([ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA],
-[Compiler's template instantiation mechanism supports the use of
-   "#pragma instantiate".  Edison Design Group compilers, e.g., SGI
-   C++ and Green Hills 1.8.8 and later, support this.])
-
 AH_TEMPLATE([ACE_NEEDS_FUNC_DEFINITIONS],
 [Compiler requires a definition for a "hidden" function, e.g., a
    private, unimplemented copy constructor or assignment operator.