diff options
Diffstat (limited to 'TAO/examples/OBV/Typed_Events')
| -rw-r--r-- | TAO/examples/OBV/Typed_Events/Client_i.cpp | 4 | ||||
| -rw-r--r-- | TAO/examples/OBV/Typed_Events/Client_i.h | 4 | ||||
| -rw-r--r-- | TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp | 70 | ||||
| -rw-r--r-- | TAO/examples/OBV/Typed_Events/Event_Types_impl.h | 66 | ||||
| -rw-r--r-- | TAO/examples/OBV/Typed_Events/Server_i.cpp | 8 | ||||
| -rw-r--r-- | TAO/examples/OBV/Typed_Events/Server_i.h | 6 |
6 files changed, 79 insertions, 79 deletions
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp index f16ddf658fd..54ee02013ee 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp @@ -88,13 +88,13 @@ Checkpoint_Client_i::run (const char *name, } // Constructor. -Checkpoint_Client_i::Checkpoint_Client_i (void) +Checkpoint_Client_i::Checkpoint_Client_i () { //no-op } //Destructor. -Checkpoint_Client_i::~Checkpoint_Client_i (void) +Checkpoint_Client_i::~Checkpoint_Client_i () { //no-op } diff --git a/TAO/examples/OBV/Typed_Events/Client_i.h b/TAO/examples/OBV/Typed_Events/Client_i.h index 31663db5ee6..0be2eeffcfa 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.h +++ b/TAO/examples/OBV/Typed_Events/Client_i.h @@ -33,10 +33,10 @@ class Checkpoint_Client_i { public: /// Constructor - Checkpoint_Client_i (void); + Checkpoint_Client_i (); /// Destructor - virtual ~Checkpoint_Client_i (void); + virtual ~Checkpoint_Client_i (); /// Execute the methods virtual int run (const char *,int, ACE_TCHAR** ); diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp index 7ce46031ad8..a52f9f7530a 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp @@ -17,7 +17,7 @@ Event_impl::~Event_impl () } ::CORBA::ValueBase * -Event_impl::_copy_value (void) +Event_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -25,7 +25,7 @@ Event_impl::_copy_value (void) } void -Event_impl::do_print (void) +Event_impl::do_print () { ACE_DEBUG((LM_DEBUG, "(time %d origin %d) ", (CORBA::ULong) this->time_(), @@ -38,7 +38,7 @@ Event_factory::~Event_factory () } TAO_OBV_CREATE_RETURN_TYPE (Event) -Event_factory::create_for_unmarshal (void) +Event_factory::create_for_unmarshal () { return new Event_impl; } @@ -60,7 +60,7 @@ Temperature_impl::~Temperature_impl () } ::CORBA::ValueBase * -Temperature_impl::_copy_value (void) +Temperature_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -68,7 +68,7 @@ Temperature_impl::_copy_value (void) } void -Temperature_impl::do_print (void) +Temperature_impl::do_print () { // The timestamp Event_impl::do_print (); @@ -81,7 +81,7 @@ Temperature_factory::~Temperature_factory () } TAO_OBV_CREATE_RETURN_TYPE (Temperature) -Temperature_factory::create_for_unmarshal (void) +Temperature_factory::create_for_unmarshal () { return new Temperature_impl; } @@ -103,7 +103,7 @@ Position_impl::~Position_impl () } ::CORBA::ValueBase * -Position_impl::_copy_value (void) +Position_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -111,7 +111,7 @@ Position_impl::_copy_value (void) } void -Position_impl::do_print (void) +Position_impl::do_print () { // The timestamp Event_impl::do_print (); @@ -126,7 +126,7 @@ Position_impl::do_print (void) x, y, z)); } -CORBA::Float Position_impl::x (void) +CORBA::Float Position_impl::x () { return this->xyz()[0]; } @@ -136,7 +136,7 @@ void Position_impl::x (CORBA::Float x) this->xyz()[0] = x; } -CORBA::Float Position_impl::y (void) +CORBA::Float Position_impl::y () { return this->xyz()[1]; } @@ -146,7 +146,7 @@ void Position_impl::y (CORBA::Float y) this->xyz()[1] = y; } -CORBA::Float Position_impl::z (void) +CORBA::Float Position_impl::z () { return this->xyz()[2]; } @@ -161,7 +161,7 @@ Position_factory::~Position_factory () } TAO_OBV_CREATE_RETURN_TYPE (Position) -Position_factory::create_for_unmarshal (void) +Position_factory::create_for_unmarshal () { return new Position_impl; } @@ -183,7 +183,7 @@ Log_Msg_impl::~Log_Msg_impl () } ::CORBA::ValueBase * -Log_Msg_impl::_copy_value (void) +Log_Msg_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -191,7 +191,7 @@ Log_Msg_impl::_copy_value (void) } void -Log_Msg_impl::do_print (void) +Log_Msg_impl::do_print () { // The timestamp Event_impl::do_print (); @@ -211,7 +211,7 @@ Log_Msg_factory::~Log_Msg_factory () } TAO_OBV_CREATE_RETURN_TYPE (Log_Msg) -Log_Msg_factory::create_for_unmarshal (void) +Log_Msg_factory::create_for_unmarshal () { return new Log_Msg_impl; } @@ -240,7 +240,7 @@ Event_List_Link_impl::~Event_List_Link_impl () } ::CORBA::ValueBase * -Event_List_Link_impl::_copy_value (void) +Event_List_Link_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -248,13 +248,13 @@ Event_List_Link_impl::_copy_value (void) } Event* -Event_List_Link_impl::get_event (void) +Event_List_Link_impl::get_event () { return this->my_event (); } Event_List_Link* -Event_List_Link_impl::get_next_link (void) +Event_List_Link_impl::get_next_link () { return this->next (); } @@ -270,26 +270,26 @@ Event_List_Link_factory::~Event_List_Link_factory () } TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link) -Event_List_Link_factory::create_for_unmarshal (void) +Event_List_Link_factory::create_for_unmarshal () { return new Event_List_Link_impl; } // Event_List implementation =================================== -Event_List_impl::Event_List_impl (void) +Event_List_impl::Event_List_impl () { this->first_link (0); this->last_link_cache_ = 0; } -Event_List_impl::~Event_List_impl (void) +Event_List_impl::~Event_List_impl () { // Destructor does nothing explicit, because the _var types do care. } ::CORBA::ValueBase * -Event_List_impl::_copy_value (void) +Event_List_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -337,12 +337,12 @@ Event_List_impl::store_event (Event* e) } } -Event_List_factory::~Event_List_factory (void) +Event_List_factory::~Event_List_factory () { } TAO_OBV_CREATE_RETURN_TYPE (Event_List) -Event_List_factory::create_for_unmarshal (void) +Event_List_factory::create_for_unmarshal () { return new Event_List_impl; } @@ -352,12 +352,12 @@ Event_List_Iterator::Event_List_Iterator (Event_List *list) this->init (list); } -Event_List_Iterator::Event_List_Iterator (void) +Event_List_Iterator::Event_List_Iterator () { // current_ is a _var and set itself to null. } -Event_List_Iterator::~Event_List_Iterator (void) +Event_List_Iterator::~Event_List_Iterator () { // nothing } @@ -428,7 +428,7 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl () } ::CORBA::ValueBase * -Temperature_Criterion_impl::_copy_value (void) +Temperature_Criterion_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -452,7 +452,7 @@ Temperature_Criterion_impl::is_critical (Event* e) } void -Temperature_Criterion_impl::do_print (void) +Temperature_Criterion_impl::do_print () { ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n", this->origin_id_ () )); @@ -464,7 +464,7 @@ Temperature_Criterion_factory::~Temperature_Criterion_factory () } TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) -Temperature_Criterion_factory::create_for_unmarshal (void) +Temperature_Criterion_factory::create_for_unmarshal () { return new Temperature_Criterion_impl; } @@ -487,7 +487,7 @@ Position_Criterion_impl::~Position_Criterion_impl () } ::CORBA::ValueBase * -Position_Criterion_impl::_copy_value (void) +Position_Criterion_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -529,7 +529,7 @@ Position_Criterion_factory::~Position_Criterion_factory () } TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion) -Position_Criterion_factory::create_for_unmarshal (void) +Position_Criterion_factory::create_for_unmarshal () { return new Position_Criterion_impl; } @@ -543,7 +543,7 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl () } ::CORBA::ValueBase * -Log_Msg_Criterion_impl::_copy_value (void) +Log_Msg_Criterion_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented @@ -564,7 +564,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e) } void -Log_Msg_Criterion_impl::do_print (void) +Log_Msg_Criterion_impl::do_print () { ACE_DEBUG((LM_DEBUG, "All log messages with urgency greater zero are registered.\n" )); @@ -575,7 +575,7 @@ Log_Msg_Criterion_factory::~Log_Msg_Criterion_factory () } TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion) -Log_Msg_Criterion_factory::create_for_unmarshal (void) +Log_Msg_Criterion_factory::create_for_unmarshal () { return new Log_Msg_Criterion_impl; } @@ -596,7 +596,7 @@ Criterion_List_impl::~Criterion_List_impl () } ::CORBA::ValueBase * -Criterion_List_impl::_copy_value (void) +Criterion_List_impl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h index 93657769e99..3f9b7213a56 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h @@ -48,9 +48,9 @@ class Event_impl : public virtual OBV_Event, public: Event_impl (); virtual ~Event_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); - virtual void do_print (void); + virtual void do_print (); // Implementation of the do_print () operation the valuetype should have. // All operations in valuetypes are virtual. @@ -85,7 +85,7 @@ protected: virtual ~Event_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (); }; #endif /* is not defined */ @@ -119,9 +119,9 @@ public: // But it is more simple to do so here. virtual ~Temperature_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); - virtual void do_print (void); + virtual void do_print (); // Overrides Event_impl::do_print (). Note that a new declaration // in IDL in a derived class is not allowed. }; @@ -137,7 +137,7 @@ protected: virtual ~Temperature_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal (); }; // Position implementation classes ===================================== @@ -149,17 +149,17 @@ public: Position_impl (); Position_impl (Point &p); virtual ~Position_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); - virtual CORBA::Float x (void); + virtual CORBA::Float x (); virtual void x (CORBA::Float); - virtual CORBA::Float y (void); + virtual CORBA::Float y (); virtual void y (CORBA::Float); - virtual CORBA::Float z (void); + virtual CORBA::Float z (); virtual void z (CORBA::Float); //These are the attributes - virtual void do_print (void); + virtual void do_print (); }; class Position_factory : public CORBA::ValueFactoryBase @@ -173,7 +173,7 @@ protected: virtual ~Position_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Position) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Position) create_for_unmarshal (); }; // Log_Msg implementation classes ===================================== @@ -185,9 +185,9 @@ public: Log_Msg_impl (); Log_Msg_impl (CORBA::Short urgency_p, const char *message_p); virtual ~Log_Msg_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); - virtual void do_print (void); + virtual void do_print (); }; class Log_Msg_factory : public CORBA::ValueFactoryBase @@ -201,7 +201,7 @@ protected: virtual ~Log_Msg_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Log_Msg) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Log_Msg) create_for_unmarshal (); }; // Event_List_Link implementation classes ===================================== @@ -220,12 +220,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link, Event_List_Link_impl (); Event_List_Link_impl (Event *e); virtual ~Event_List_Link_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); - Event *get_event (void); + Event *get_event (); private: - Event_List_Link *get_next_link (void); + Event_List_Link *get_next_link (); void attach_next_link (Event_List_Link * chain); // Attach a chain at the end. @@ -239,7 +239,7 @@ protected: virtual ~Event_List_Link_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link) create_for_unmarshal (); }; // The event list itself. ---------------------------------- @@ -252,11 +252,11 @@ class Event_List_impl : public virtual OBV_Event_List, public: Event_List_impl (); virtual ~Event_List_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); void store_event (Event* e); - Event_List_Link *get_first_link(void); + Event_List_Link *get_first_link(); // The iterator needs it. private: @@ -280,13 +280,13 @@ protected: virtual ~Event_List_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Event_List) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Event_List) create_for_unmarshal (); }; class Event_List_Iterator { public: - Event_List_Iterator (void); + Event_List_Iterator (); Event_List_Iterator (Event_List *list); // Construct it to point to the first list link. @@ -328,11 +328,11 @@ public: Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp); virtual ~Temperature_Criterion_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); CORBA::Boolean is_critical (Event* e); - virtual void do_print (void); + virtual void do_print (); }; class Temperature_Criterion_factory : public CORBA::ValueFactoryBase @@ -341,7 +341,7 @@ class Temperature_Criterion_factory : public CORBA::ValueFactoryBase private: virtual ~Temperature_Criterion_factory (); - TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal (); }; class Position_Criterion_impl : @@ -355,11 +355,11 @@ public: Position *lb, Position *tr); virtual ~Position_Criterion_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); CORBA::Boolean is_critical (Event* e); - virtual void do_print (void); + virtual void do_print (); }; class Position_Criterion_factory : public CORBA::ValueFactoryBase @@ -370,7 +370,7 @@ protected: virtual ~Position_Criterion_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion) create_for_unmarshal (); }; class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion, @@ -380,11 +380,11 @@ class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion, public: Log_Msg_Criterion_impl (); virtual ~Log_Msg_Criterion_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); CORBA::Boolean is_critical (Event* e); - virtual void do_print (void); + virtual void do_print (); }; class Log_Msg_Criterion_factory : public CORBA::ValueFactoryBase @@ -395,7 +395,7 @@ protected: virtual ~Log_Msg_Criterion_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion) create_for_unmarshal (); }; class Criterion_List_impl : public virtual OBV_Criterion_List, @@ -404,7 +404,7 @@ class Criterion_List_impl : public virtual OBV_Criterion_List, public: Criterion_List_impl (); virtual ~Criterion_List_impl (); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); void store_criterion (Criterion *c); CORBA::Boolean is_critical (Event *e); diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp index e317239e1d2..b9bf7e3de68 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp @@ -128,7 +128,7 @@ Checkpoint_i::put_event (Event *event) Event_List * -Checkpoint_i::get_critical_events (void) +Checkpoint_i::get_critical_events () { // The skeleton should not steal our list by decrementing // the reference counter. @@ -144,7 +144,7 @@ Checkpoint_i::get_critical_events (void) // Shutdown the server application. void -Checkpoint_i::shutdown (void) +Checkpoint_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "\nThe Checkpoint server is shutting down\n")); @@ -156,12 +156,12 @@ Checkpoint_i::shutdown (void) // Constructor. -Checkpoint_i::Checkpoint_i (void) +Checkpoint_i::Checkpoint_i () { } // Destructor. -Checkpoint_i::~Checkpoint_i (void) +Checkpoint_i::~Checkpoint_i () { } diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h index 01ee4d8fdb3..f433bc1e191 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.h +++ b/TAO/examples/OBV/Typed_Events/Server_i.h @@ -21,10 +21,10 @@ class Checkpoint_i : public POA_Checkpoint { public: /// Constructor. - Checkpoint_i (void); + Checkpoint_i (); /// Destructor. - ~Checkpoint_i (void); + ~Checkpoint_i (); virtual void put_event ( Event * e @@ -34,7 +34,7 @@ public: ); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); |