summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ace/config-sunos5.5-sunc++-4.x-orbix.h3
-rw-r--r--ace/config-sunos5.5-sunc++-4.x.h3
-rw-r--r--include/makeinclude/platform_sunos5_sunc++.GNU2
-rw-r--r--include/makeinclude/platform_sunos5_sunc++_orbix.GNU2
4 files changed, 6 insertions, 4 deletions
diff --git a/ace/config-sunos5.5-sunc++-4.x-orbix.h b/ace/config-sunos5.5-sunc++-4.x-orbix.h
index e470b37e0d8..2ed3240e151 100644
--- a/ace/config-sunos5.5-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.5-sunc++-4.x-orbix.h
@@ -9,7 +9,8 @@
#if !defined (ACE_CONFIG_H)
#define ACE_CONFIG_H
-#define ACE_HAS_EXCEPTIONS
+// until we can trust exception handling with Sun C++, it's not enabled . . .
+// #define ACE_HAS_EXCEPTIONS
// Platform contains the Orbix CORBA implementation.
#define ACE_HAS_ORBIX
diff --git a/ace/config-sunos5.5-sunc++-4.x.h b/ace/config-sunos5.5-sunc++-4.x.h
index 6d48e9d2150..6dc3ffe3138 100644
--- a/ace/config-sunos5.5-sunc++-4.x.h
+++ b/ace/config-sunos5.5-sunc++-4.x.h
@@ -7,7 +7,8 @@
#if !defined (ACE_CONFIG_H)
#define ACE_CONFIG_H
-#define ACE_HAS_EXCEPTIONS
+// until we can trust exception handling with Sun C++, it's not enabled . . .
+// #define ACE_HAS_EXCEPTIONS
#define ACE_HAS_UNICODE
// #define ACE_HAS_TEMPLATE_TYPEDEFS
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index ea8de40003b..841934a6dcb 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -16,7 +16,7 @@
# There should be no other warnings from Sun C++ when building ACE.
#
CC = cc
-CXX = CC +w -mt -pta # -noex This option should solve some evil problems with Solaris
+CXX = CC +w -mt -pta -noex
DLD = $(CXX)
LD = $(CXX)
LDFLAGS += -R $(WRAPPER_ROOT)/ace
diff --git a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
index 6fc09f5d924..1f4398c0115 100644
--- a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
@@ -1,7 +1,7 @@
# SunOS 5.x (Solaris 2.x) with SunC++ 4.0.1 or earlier
# *using* Orbix
CC = cc
-CXX = CC -mt -pta # s-noex
+CXX = CC -mt -pta -noex
DLD = $(CXX)
LD = $(CXX)
INCLDIRS = -I$(ORBIX_ROOT)/include