summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ace/config-sunos5.5.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 55bd54ae98c..6d0c4f73339 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -26,15 +26,18 @@
With CC 5.0, those problems may be fixed. And, this is necessary
to work around problems with automatic template instantiation. */
# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
+# define ACE_TEMPLATES_REQUIRE_SOURCE
+ // If -compat=4 is turned on, the old 4.2 settings for iostreams are used,
+ // but the newer, explicit instantiation is used (above)
+# if (__SUNPRO_CC_COMPAT >= 5)
+# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
// Note that SunC++ 5.0 doesn't yet appear to support
// ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION...
-# define ACE_TEMPLATES_REQUIRE_SOURCE
-# define ACE_HAS_STANDARD_CPP_LIBRARY 1
-# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-# define ACE_USES_OLD_IOSTREAMS 1
-# define ACE_HAS_THR_C_DEST
-
+# define ACE_HAS_STANDARD_CPP_LIBRARY 1
+# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+# define ACE_USES_OLD_IOSTREAMS 1
+# define ACE_HAS_THR_C_DEST
+# endif
# if !defined (ACE_HAS_EXCEPTIONS)
// See /opt/SUNWspro_5.0/SC5.0/include/CC/stdcomp.h:
# define _RWSTD_NO_EXCEPTIONS 1