ChangeLogTag: Thu Nov 11 09:46:58 2004 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 20 insertions, 12 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index c4a5fec820e..78ffcb74380 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,16 @@
+Thu Nov 11 09:46:58 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * performance-tests/Protocols/Receiver/Receiver.mpc:
+        * performance-tests/Protocols/Sender/Sender.mpc:
+        * tests/RTCCM/DiffServ/Controller/Controller.mpc:
+
+          Added requires += exceptions for these projects.
+
+        * performance-tests/Protocols/Sender/Sender_exec.cpp:
+
+          Removed ACE_CHECK's which caused compilation errors when
+          exceptions=0 was set.
+
 Thu Nov 11 14:40:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/ciao/Servant_Activator.cpp:
diff --git a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index 398e114cca2..d5d4edbe507 100644
--- a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -3,6 +3,7 @@
 
 project(Protocols_Receiver_stub): ciao_client {
   libs += Protocols_stub
+  requires += exceptions
   after += Protocols_stub
   sharedname = Protocols_Receiver_stub
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export -Wb,stub_export_include=Receiver_stub_export.h -Wb,skel_export_macro=RECEIVER_SVNT_Export -Wb,skel_export_include=Receiver_svnt_export.h
@@ -21,7 +22,7 @@ project(Protocols_Receiver_svnt) : ciao_servant {
   after += Protocols_svnt Protocols_Receiver_stub
   sharedname  = Protocols_Receiver_svnt
   libs    += Protocols_Receiver_stub Protocols_stub Protocols_svnt
-  
+  requires += exceptions
   idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
@@ -45,16 +46,14 @@ project(Protocols_Receiver_exec) : ciao_component {
   after   += Protocols_Receiver_svnt
   sharedname = Protocols_Receiver_exec
   libs      += Protocols_Receiver_stub Protocols_Receiver_svnt Protocols_stub Protocols_svnt
-  
+  requires += exceptions
   idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
   }
 
   Source_Files {
-    
     Receiver_exec.cpp
   }
 }
diff --git a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index 7079dc503c9..cdec19cd856 100644
--- a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -3,7 +3,7 @@
 
 project(Protocols_Sender_stub): ciao_client {
   libs += Protocols_stub
-
+  requires += exceptions
   after += Protocols_stub
   sharedname = Protocols_Sender_stub
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export -Wb,stub_export_include=Sender_stub_export.h -Wb,skel_export_macro=SENDER_SVNT_Export -Wb,skel_export_include=Sender_svnt_export.h
@@ -22,7 +22,7 @@ project(Protocols_Sender_svnt) : ciao_servant {
   after += Protocols_svnt Protocols_Sender_stub
   sharedname  = Protocols_Sender_svnt
   libs    += Protocols_Sender_stub Protocols_stub Protocols_svnt
-  
+  requires += exceptions
   idlflags  +=  -Wb,export_macro=SENDER_SVNT_Export -Wb,export_include=Sender_svnt_export.h
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
@@ -47,12 +47,11 @@ project(Protocols_Sender_exec) : ciao_component, rtcorba {
   sharedname = Protocols_Sender_exec
   libs      += Protocols_Sender_stub Protocols_Sender_svnt Protocols_stub Protocols_svnt
   includes += ../../../../tests/RTCORBA/Diffserv
-  
+  requires += exceptions
   idlflags  +=  -Wb,export_macro=SENDER_EXEC_Export -Wb,export_include=Sender_exec_export.h
   dynamicflags   = SENDER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
   }
 
   Source_Files {
diff --git a/TAO/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/TAO/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
index 2c0c00875ad..3079aa04a3b 100644
--- a/TAO/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
@@ -161,7 +161,6 @@ Worker::Worker (CORBA::ORB_ptr orb,
     RTCORBA::TCPProtocolProperties::_narrow (base_transport_protocol_properties.in ());
 
   tcp_base_transport_protocol_properties->enable_network_priority (this->enable_diffserv_code_points_);
-  ACE_CHECK;
 
   RTCORBA::ProtocolList protocols;
   protocols.length (1);
@@ -189,7 +188,6 @@ Worker::Worker (CORBA::ORB_ptr orb,
         RTCORBA::UserDatagramProtocolProperties::_narrow (test_transport_protocol_properties.in ());
 
       udp_test_transport_protocol_properties->enable_network_priority (enable_diffserv_code_points);
-      ACE_CHECK;
     }
   else if (protocols[0].protocol_type == TAO_TAG_SCIOP_PROFILE)
     {
@@ -197,7 +195,6 @@ Worker::Worker (CORBA::ORB_ptr orb,
         RTCORBA::StreamControlProtocolProperties::_narrow (test_transport_protocol_properties.in ());
 
       sctp_test_transport_protocol_properties->enable_network_priority (enable_diffserv_code_points);
-      ACE_CHECK;
     }
   else if (protocols[0].protocol_type == IOP::TAG_INTERNET_IOP)
     {
@@ -205,7 +202,6 @@ Worker::Worker (CORBA::ORB_ptr orb,
         RTCORBA::TCPProtocolProperties::_narrow (test_transport_protocol_properties.in ());
 
       tcp_test_transport_protocol_properties->enable_network_priority (enable_diffserv_code_points);
-      ACE_CHECK;
     }
 
   protocols[0].transport_protocol_properties =
diff --git a/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc b/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc
index dd77face4c5..6236570f5f1 100644
--- a/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc
+++ b/TAO/CIAO/tests/RTCCM/DiffServ/Controller/Controller.mpc
@@ -2,6 +2,7 @@
 
 project (*) : ciao_client, rtcorba {
   after += DiffServ_Sender_stub DiffServ_Receiver_stub
+  requires += exceptions
   includes += ../Sender
   includes += ../Receiver
   libs += DiffServ_Sender_stub DiffServ_Receiver_stub DiffServ_stub