summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-11-13 05:20:45 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-11-13 05:20:45 +0000
commit9ca799cead78ed45378275e47af61aec0d097c13 (patch)
treeacc01dca40d68f8c80c4ed10f2269e7993506101
parent09b08f2443aff9970a060ab80081fe8a9149186a (diff)
downloadATCD-9ca799cead78ed45378275e47af61aec0d097c13.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-98c24
-rw-r--r--TAO/tao/orbconf.h8
2 files changed, 17 insertions, 15 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 261cf6b8f49..41697398ff5 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,15 +1,21 @@
+Thu Nov 12 23:21:26 1998 Irfan Pyarali <irfan@cs.wustl.edu>
+
+ * tao/orbconf.h: Native exceptions seem to be working fine. I
+ have restored the TAO_HAS_EXCEPTIONS option in the configuration
+ file.
+
Thu Nov 12 17:30:00 1998 Chris Gill <cdgill@cs.wustl.edu>
* orbsvcs/orbsvcs/Scheduler_Factory.cpp
- orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
- orbsvcs/tests/EC_Mcast/EC_Mcast.{cpp, h}
- orbsvcs/tests/EC_Multiple/EC_Multiple.{cpp, h}
- orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
- orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
- orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
- orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
- orbsvcs/tests/Event_Latency/Event_Latency.cpp: Fixed stray
- compiler errors caused by RtecSceduler IDL portability changes.
+ orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+ orbsvcs/tests/EC_Mcast/EC_Mcast.{cpp, h}
+ orbsvcs/tests/EC_Multiple/EC_Multiple.{cpp, h}
+ orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
+ orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
+ orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
+ orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+ orbsvcs/tests/Event_Latency/Event_Latency.cpp: Fixed stray
+ compiler errors caused by RtecSceduler IDL portability changes.
Thu Nov 12 14:21:41 1998 Matthew J Braun <mjb2@cec.wustl.edu>
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 89a8dc422af..1d7d8251a6a 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -187,14 +187,10 @@
#define TAO_DEFAULT_CDR_MEMCPY_TRADEOFF 256
#if defined (ACE_HAS_EXCEPTIONS)
-//
-// Please uncomment the following two #defines once exceptions are
-// working in TAO. For now, they are not working properly.
-//
-//# define TAO_HAS_EXCEPTIONS
+# define TAO_HAS_EXCEPTIONS
// TAO_USE_EXCEPTIONS is only here for backwards compatibility and
// will go away shortly so don't use it...
-//# define TAO_USE_EXCEPTIONS
+# define TAO_USE_EXCEPTIONS
#elif (defined (TAO_HAS_EXCEPTIONS) || defined (TAO_USE_EXCEPTIONS)) && !defined (ACE_HAS_EXCEPTIONS)
# error "tao/orbconf.h: You can only use exceptions in TAO if ACE supports them"
#endif /* TAO_HAS_EXCEPTIONS */