summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2005-12-15 13:07:11 +0000
committerSteve Huston <shuston@riverace.com>2005-12-15 13:07:11 +0000
commit7f9a00ced8e3e84753cad3cd589337eaf7f812b2 (patch)
tree9cd668fb8a4f2b04c466d1b9c752bde4e4aca190
parent299c6b22187bdd201c72948170f1e125b6b6ea0b (diff)
downloadATCD-7f9a00ced8e3e84753cad3cd589337eaf7f812b2.tar.gz
ChangeLogTag:Thu Dec 15 08:06:29 2005 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog7
-rw-r--r--ace/Service_Templates.cpp11
2 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 926d474c140..e4cf35bdde7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Dec 15 08:06:29 2005 Steve Huston <shuston@riverace.com>
+
+ * ace/Service_Templates.cpp: Only #include headers if we need to
+ instantiate templates; i.e., if using either form of explicit
+ template instantiation. This avoids the sigaction issue with
+ HP aC++ A.03.56.
+
Tue Dec 13 12:13:26 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>
* COPYING: Updated this file to mention compliance issues wrt the
diff --git a/ace/Service_Templates.cpp b/ace/Service_Templates.cpp
index a859c368148..11569316299 100644
--- a/ace/Service_Templates.cpp
+++ b/ace/Service_Templates.cpp
@@ -1,7 +1,14 @@
// $Id$
-#include "ace/Service_Templates.h"
-#include "ace/SString.h"
+#include "ace/config-lite.h"
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# include "ace/Service_Templates.h"
+# include "ace/SString.h"
+
+#endif
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)