summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1997-05-09 17:12:10 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1997-05-09 17:12:10 +0000
commit1714e0c9d60de81f18a56714504fa4016ee9f6b6 (patch)
tree83bc8127f1690754e216027fb54a6629acf309ba /ace
parentd2782d97bbcdb9a714720f4fe7f8860cd35b2300 (diff)
downloadATCD-1714e0c9d60de81f18a56714504fa4016ee9f6b6.tar.gz
*** empty log message ***
Diffstat (limited to 'ace')
-rw-r--r--ace/IOStream.h4
-rw-r--r--ace/config-osf1-4.0-g++.h6
-rw-r--r--ace/config-osf1-4.0.h1
3 files changed, 6 insertions, 5 deletions
diff --git a/ace/IOStream.h b/ace/IOStream.h
index 11cf840bfa9..e20f8d79d15 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -94,9 +94,9 @@ typedef String ACE_IOStream_String;
#if defined (ACE_HAS_STRING_CLASS)
-#if defined (__alpha)
+#if defined (DIGITAL_UNIX) && defined (DEC_CXX)
#include <stl_macros>
-#endif /* __alpha */
+#endif /* DIGITAL_UNIX && DEC_CXX */
class QuotedString : public ACE_IOStream_String
{
diff --git a/ace/config-osf1-4.0-g++.h b/ace/config-osf1-4.0-g++.h
index 2bc7f84a15b..529fbdc664f 100644
--- a/ace/config-osf1-4.0-g++.h
+++ b/ace/config-osf1-4.0-g++.h
@@ -22,9 +22,8 @@
// Must specialize templates due to G++'s lame parameterized type
// support...
#define ACE_TEMPLATES_REQUIRE_SPECIALIZATION
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+// #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-#define ACE_HAS_STRING_CLASS
// Compiler's template mechanism must see source code (i.e., .C
// files).
#define ACE_TEMPLATES_REQUIRE_SOURCE
@@ -60,6 +59,9 @@
// parameter.
#define ACE_HAS_BROKEN_SETRLIMIT
+#define ACE_HAS_STRING_CLASS
+#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+
// Platform supports POSIX 1.b clock_gettime ()
#define ACE_HAS_CLOCK_GETTIME
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index 2f4d0c8a4cb..73f3f22576a 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -13,7 +13,6 @@
#define ACE_HAS_STRING_CLASS
#define ACE_LACKS_LINEBUFFERED_STREAMBUF
#define ACE_LACKS_SIGNED_CHAR
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
#if ! defined (__ACE_INLINE__)
#define __ACE_INLINE__