summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2001-03-02 15:30:47 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2001-03-02 15:30:47 +0000
commit7116b24ca062859591f260805da244cd23e48183 (patch)
treef307d8826b7ec798156823569edefa2503171159
parentf5227ddf8c36e6401b6c0d2934899520bffce0ce (diff)
downloadATCD-7116b24ca062859591f260805da244cd23e48183.tar.gz
ChangeLogTag:Fri Mar 02 07:25:50 2001 Ossama Othman <ossama@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a14
-rw-r--r--TAO/tao/ORB_Core.cpp4
2 files changed, 18 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 00cfa1a94f0..9406e4e9743 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Fri Mar 02 07:25:50 2001 Ossama Othman <ossama@uci.edu>
+
+ * tao/ORB_Core.cpp (destroy_interceptors):
+
+ Fixed a compile-time warning that occured on native exception
+ builds.
+
Fri Mar 2 02:18:32 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de>
* tests/AMI_Timeouts/timeout_i.cpp:
@@ -341,6 +348,13 @@ Thu Mar 01 09:38:28 2001 Ossama Othman <ossama@uci.edu>
inlining them only serves to increase the footprint since
inlined destructor code is placed at all exit points.
+ * tao/TAO.dsp:
+ * tao/TAO_Static.dsp:
+ * tao/Makefile:
+ * tao/Makefile.bor:
+
+ Added Codec related filenames to these files.
+
* tests/Codec/Codec.dsw:
* tests/Codec/Makefile:
* tests/Codec/Makefile.bor:
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 5238a1b710b..de1aea36419 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -2024,6 +2024,10 @@ TAO_ORB_Core::destroy_interceptors (CORBA::Environment &ACE_TRY_ENV)
}
#endif /* TAO_HAS_INTERCEPTORS == 1 */
+#ifdef TAO_HAS_EXCEPTIONS
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+#endif /* TAO_HAS_EXCEPTIONS */
+
TAO_IORInterceptor_List::TYPE &ior_interceptors =
this->ior_interceptors_.interceptors ();