summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1999-10-08 12:48:14 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1999-10-08 12:48:14 +0000
commit8672a9e2dbd3d2c6d86e170cf906f1362f86a97e (patch)
tree414ff8ed555f350305f22e959c5f02894da80bc1
parent9c2f6425fe3426419750ff1dffd907874580598f (diff)
downloadATCD-8672a9e2dbd3d2c6d86e170cf906f1362f86a97e.tar.gz
ChangeLogTag:Fri Oct 8 07:47:08 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
-rw-r--r--ChangeLog-99b5
-rw-r--r--ace/OS.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index bd725f1f7d6..93b78918eac 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,8 @@
+Fri Oct 8 07:47:08 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/OS.h: Removed the word "defined" since that was breaking
+ SunCC 4.2. Thanks to Andy Gokhale for reporting this.
+
Thu Oct 07 18:47:03 1999 Irfan Pyarali <irfan@cs.wustl.edu>
* ace/OS.h (ACE_NOTSUP): Added new macro. This one is similar to
diff --git a/ace/OS.h b/ace/OS.h
index 81c9621f5e2..f3897140f96 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -7405,7 +7405,7 @@ private:
# if defined (ACE_NEW_THROWS_EXCEPTIONS)
# if (__SUNPRO_CC)
-# if defined (__SUNPRO_CC < 0x500) || ((__SUNPRO_CC == 0x500 && > __SUNPRO_CC_COMPAT == 4))
+# if (__SUNPRO_CC < 0x500) || ((__SUNPRO_CC == 0x500 && > __SUNPRO_CC_COMPAT == 4))
# include /**/ <exception.h>
// Note: we catch ::xalloc rather than just xalloc because of
// a name clash with unsafe_ios::xalloc()