summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/examples/RtEC
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/examples/RtEC')
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h6
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp1
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h3
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h6
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp3
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h9
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp1
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h3
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Consumer.h6
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp1
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Supplier.h3
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h6
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp1
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h3
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Consumer.h6
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp1
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Supplier.h3
22 files changed, 18 insertions, 54 deletions
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index 3a6642ff963..9c2c1d2ffef 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -130,7 +130,6 @@ Consumer::run (int argc, char* argv[])
void
Consumer::push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (events.length () == 0)
{
@@ -150,7 +149,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
void
Consumer::disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// In this example we shutdown the ORB when we disconnect from the
// EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
index 8541290d29a..a477656b498 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
@@ -37,10 +37,8 @@ public:
// = The RtecEventComm::PushConsumer methods
// The skeleton methods.
- virtual void push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void push (const RtecEventComm::EventSet& events);
+ virtual void disconnect_push_consumer (void);
private:
int parse_args (int argc, char *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index e5d03182523..f016dbfff30 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -144,7 +144,6 @@ Supplier::run (int argc, char* argv[])
void
Supplier::disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
index e42042c197d..4e4a3c97fe7 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
@@ -36,8 +36,7 @@ public:
// = The RtecEventComm::PushSupplier methods
/// The skeleton methods.
- virtual void disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void disconnect_push_supplier (void);
private:
int parse_args (int argc, char *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 20ff6a10b22..3c88f73b002 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -10,7 +10,6 @@ Consumer::Consumer (void)
void
Consumer::push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (events.length () == 0)
{
@@ -25,7 +24,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
void
Consumer::disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
index 51bacf725b8..36c247802f6 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
@@ -44,10 +44,8 @@ public:
// = The RtecEventComm::PushConsumer methods
- virtual void push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void push (const RtecEventComm::EventSet& events);
+ virtual void disconnect_push_consumer (void);
// The skeleton methods.
};
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index ec77f956c8b..9dd7b492b1a 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -38,7 +38,6 @@ Supplier::timeout_occured (void)
void
Supplier::disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
@@ -49,7 +48,6 @@ Timeout_Consumer::Timeout_Consumer (Supplier* supplier)
void
Timeout_Consumer::push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (events.length () == 0)
{
@@ -64,7 +62,6 @@ Timeout_Consumer::push (const RtecEventComm::EventSet& events)
void
Timeout_Consumer::disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
index 0ca45a86b8f..8222337af57 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
@@ -46,8 +46,7 @@ public:
// = The RtecEventComm::PushSupplier methods
- virtual void disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void disconnect_push_supplier (void);
// The skeleton methods.
void timeout_occured (void);
@@ -73,10 +72,8 @@ public:
// = The RtecEventComm::PushConsumer methods
- virtual void push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void push (const RtecEventComm::EventSet& events);
+ virtual void disconnect_push_consumer (void);
// The skeleton methods.
private:
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index c7ba18ae47b..79c0d07e1bf 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -12,7 +12,6 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
void
AddrServer::get_addr (const RtecEventComm::EventHeader&,
RtecUDPAdmin::UDP_Addr_out addr)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
addr = this->addr_;
}
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
index deeced433db..de7aeb6d590 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
@@ -40,8 +40,7 @@ public:
// = The RtecUDPAdmin::AddrServer methods
virtual void get_addr (const RtecEventComm::EventHeader& header,
- RtecUDPAdmin::UDP_Addr_out addr)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ RtecUDPAdmin::UDP_Addr_out addr);
private:
RtecUDPAdmin::UDP_Addr addr_;
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index 4f5bbb2cc1e..125c8b7775d 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -67,7 +67,6 @@ Consumer::disconnect (void)
void
Consumer::push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (events.length () == 0)
{
@@ -87,7 +86,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
void
Consumer::disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index 9985ca129d6..5c4f141719d 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -45,10 +45,8 @@ public:
// = The RtecEventComm::PushConsumer methods
- virtual void push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void push (const RtecEventComm::EventSet& events);
+ virtual void disconnect_push_consumer (void);
// The skeleton methods.
private:
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index 205518d540d..5ad924f7209 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -76,7 +76,6 @@ Supplier::perform_push (void)
void
Supplier::disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 67c885b6d08..6ee7f3251cd 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -49,8 +49,7 @@ public:
// = The RtecEventComm::PushSupplier methods
- virtual void disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void disconnect_push_supplier (void);
// The skeleton methods.
private:
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 20ff6a10b22..3c88f73b002 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -10,7 +10,6 @@ Consumer::Consumer (void)
void
Consumer::push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (events.length () == 0)
{
@@ -25,7 +24,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
void
Consumer::disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index 51bacf725b8..36c247802f6 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -44,10 +44,8 @@ public:
// = The RtecEventComm::PushConsumer methods
- virtual void push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void push (const RtecEventComm::EventSet& events);
+ virtual void disconnect_push_consumer (void);
// The skeleton methods.
};
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index 9411ec8c3b3..f1714bf8773 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -12,7 +12,6 @@ Supplier::Supplier (void)
void
Supplier::disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index d255d1e8c7f..8824c4b9f86 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
@@ -44,8 +44,7 @@ public:
// = The RtecEventComm::PushSupplier methods
- virtual void disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void disconnect_push_supplier (void);
// The skeleton methods.
private:
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index a1a1ca46a0f..5203f82a466 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -114,7 +114,6 @@ Consumer::run (int argc, char* argv[])
void
Consumer::push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (events.length () == 0)
{
@@ -134,7 +133,6 @@ Consumer::push (const RtecEventComm::EventSet& events)
void
Consumer::disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// In this example we shutdown the ORB when we disconnect from the
// EC (or rather the EC disconnects from us), but this doesn't have
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index af6a05b2b3b..8641e434194 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -41,10 +41,8 @@ public:
// = The RtecEventComm::PushConsumer methods
- virtual void push (const RtecEventComm::EventSet& events)
- ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void disconnect_push_consumer (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void push (const RtecEventComm::EventSet& events);
+ virtual void disconnect_push_consumer (void);
// The skeleton methods.
private:
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 2a61331ed38..56b0a8063cc 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -123,7 +123,6 @@ Supplier::run (int argc, char* argv[])
void
Supplier::disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
}
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index edc8bd098a4..2587333a271 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -41,8 +41,7 @@ public:
// = The RtecEventComm::PushSupplier methods
- virtual void disconnect_push_supplier (void)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void disconnect_push_supplier (void);
// The skeleton methods.
private: