diff options
Diffstat (limited to 'TAO/IIOP')
47 files changed, 2674 insertions, 2586 deletions
diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h index 4198fba9a10..8a4f73314ce 100644 --- a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h +++ b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h @@ -3,7 +3,7 @@ /* An interval timer class using C++. */ -#if !defined (ACE_PROFILE_TIMER_H) +#ifndef ACE_PROFILE_TIMER_H #define ACE_PROFILE_TIMER_H #include <sys/types.h> @@ -38,21 +38,21 @@ private: prusage_t begin_usage_; prusage_t end_usage_; prusage_t last_usage_; - int proc_fd_; + int proc_fd_; }; /* Start timing */ -inline int -Profile_Timer::start (void) +inline int +Profile_Timer::start (void) { return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_); } /* Stop timing */ -inline int -Profile_Timer::stop (void) +inline int +Profile_Timer::stop (void) { this->last_usage_ = this->end_usage_; return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_); diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h index 4198fba9a10..8a4f73314ce 100644 --- a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h +++ b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h @@ -3,7 +3,7 @@ /* An interval timer class using C++. */ -#if !defined (ACE_PROFILE_TIMER_H) +#ifndef ACE_PROFILE_TIMER_H #define ACE_PROFILE_TIMER_H #include <sys/types.h> @@ -38,21 +38,21 @@ private: prusage_t begin_usage_; prusage_t end_usage_; prusage_t last_usage_; - int proc_fd_; + int proc_fd_; }; /* Start timing */ -inline int -Profile_Timer::start (void) +inline int +Profile_Timer::start (void) { return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_); } /* Stop timing */ -inline int -Profile_Timer::stop (void) +inline int +Profile_Timer::stop (void) { this->last_usage_ = this->end_usage_; return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_); diff --git a/TAO/IIOP/test/Orbix/base_server/cubit.h b/TAO/IIOP/test/Orbix/base_server/cubit.h index 1fd0a2d3c7d..37fb9f317d4 100644 --- a/TAO/IIOP/test/Orbix/base_server/cubit.h +++ b/TAO/IIOP/test/Orbix/base_server/cubit.h @@ -5,6 +5,11 @@ #define cubit_hh #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include <CORBA.h> @@ -13,7 +18,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -28,12 +33,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -92,12 +97,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -711,7 +716,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/test/Orbix/base_server/cubitC.h b/TAO/IIOP/test/Orbix/base_server/cubitC.h index 584efa67c8d..5c020bd0c4b 100644 --- a/TAO/IIOP/test/Orbix/base_server/cubitC.h +++ b/TAO/IIOP/test/Orbix/base_server/cubitC.h @@ -28,316 +28,316 @@ typedef Cubit_ptr CubitRef; class Cubit_var { public: - Cubit_var(); - Cubit_var(Cubit_ptr); - Cubit_var(const Cubit_var&); - ~Cubit_var(); - Cubit_var& operator=(Cubit_ptr); - operator Cubit_ptr() const { return _ptr; } + Cubit_var(); + Cubit_var(Cubit_ptr); + Cubit_var(const Cubit_var&); + ~Cubit_var(); + Cubit_var& operator=(Cubit_ptr); + operator Cubit_ptr() const { return _ptr; } #if defined(_HPCC_BUG) - operator Cubit *&() { return _ptr; } + operator Cubit *&() { return _ptr; } #else - operator Cubit_ptr&() { return _ptr; } + operator Cubit_ptr&() { return _ptr; } #endif - Cubit_ptr operator->() const { return _ptr;} - friend NCistream& operator>>(NCistream&, Cubit_var&); - friend NCostream& operator<<(NCostream&, const Cubit_var&); - friend istream& operator>>(istream&, Cubit_var&); - friend ostream& operator<<(ostream&, const Cubit_var&); + Cubit_ptr operator->() const { return _ptr;} + friend NCistream& operator>>(NCistream&, Cubit_var&); + friend NCostream& operator<<(NCostream&, const Cubit_var&); + friend istream& operator>>(istream&, Cubit_var&); + friend ostream& operator<<(ostream&, const Cubit_var&); private: - Cubit_ptr _ptr; - void operator=(const Cubit_var&) {} + Cubit_ptr _ptr; + void operator=(const Cubit_var&) {} }; #endif class Cubit: public virtual CORBA_Object { private: - static const CORBA::TypeInfo _class_info; - Cubit(const Cubit&) {} - void operator=(const Cubit&){} + static const CORBA::TypeInfo _class_info; + Cubit(const Cubit&) {} + void operator=(const Cubit&){} public: - static const CORBA::TypeInfo *_desc(); - virtual const CORBA::TypeInfo *_type_info() const; - virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; - static CORBA::Object *_factory(); + static const CORBA::TypeInfo *_desc(); + virtual const CORBA::TypeInfo *_type_info() const; + virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; + static CORBA::Object *_factory(); protected: - Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} - Cubit(NCistream& strm) :CORBA_Object(strm) {} - virtual ~Cubit() {} + Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} + Cubit(NCistream& strm) :CORBA_Object(strm) {} + virtual ~Cubit() {} public: - static Cubit_ptr _duplicate(Cubit_ptr obj) { - if (obj ) obj->_ref(); - return obj; - } - static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} - static Cubit_ptr _narrow(CORBA::Object *obj); - static Cubit_ptr _clone(Cubit_ptr obj) { - CORBA::Object_var obj_var(__clone(obj)); + static Cubit_ptr _duplicate(Cubit_ptr obj) { + if (obj ) obj->_ref(); + return obj; + } + static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} + static Cubit_ptr _narrow(CORBA::Object *obj); + static Cubit_ptr _clone(Cubit_ptr obj) { + CORBA::Object_var obj_var(__clone(obj)); #if defined(_HPCC_BUG) - return _narrow(obj_var.operator CORBA::Object_ptr()); + return _narrow(obj_var.operator CORBA::Object_ptr()); #else - return _narrow(obj_var); + return _narrow(obj_var); #endif - } - static Cubit_ptr _bind(const char *object_name = NULL, - const char *host_name = NULL, - const CORBA::BindOptions* opt = NULL); - - virtual CORBA::Octet cube_octet(CORBA::Octet o); - - virtual CORBA::Short cube_short(CORBA::Short s); - - virtual CORBA::Long cube_long(CORBA::Long l); - - struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - }; - friend NCostream& operator<<(NCostream&, const Many& ); - friend NCistream& operator>>(NCistream&, Many& ); - - friend ostream& operator<<(ostream&, const Many& ); - inline friend istream& operator>>(istream& _strm, Many& _obj) { - NCistream _istrm(_strm); - _istrm >> _obj; - return _strm; - } - - - typedef Many *Many_ptr; - class Many_var - { - public: - Many_var() { _ptr = (Many*)NULL;} - Many_var(Many *ptr) { - _ptr = ptr; - } - Many_var(const Many_var& var) { - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - } - ~Many_var() { - if (_ptr != (Many *)NULL) delete _ptr; - } - Many_var& operator=(Many *ptr) { - if (_ptr != (Many *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - Many_var& operator=(const Many_var& var) { - if (_ptr != (Many *)NULL) delete _ptr; - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - return *this; - } - Many *operator->() { return _ptr; } - operator Many () const { return *_ptr; } - operator Many& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const Many_var& var) { - if (var._ptr == (Many *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - Many_var& var) { - if ( ! var._ptr) - var._ptr = new Many; - strm >> *var._ptr; - return strm; - } - private: - Many *_ptr; - }; - - - virtual Cubit::Many cube_struct(const Cubit::Many& values); - - enum discrim { - e_0th, - e_1st, - e_2nd, - e_3rd, - e_4th, - e_5th - }; - inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - if (_temp >= 6) - throw CORBA::BAD_PARAM(); - _enum_type = discrim(_temp); - return _strm; - } - inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { - if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { - _strm << "discrim:"; - switch(_enum_type) { - case e_0th: - _strm << "e_0th" << endl; - break; - case e_1st: - _strm << "e_1st" << endl; - break; - case e_2nd: - _strm << "e_2nd" << endl; - break; - case e_3rd: - _strm << "e_3rd" << endl; - break; - case e_4th: - _strm << "e_4th" << endl; - break; - case e_5th: - _strm << "e_5th" << endl; - break; - } - } - else - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - _enum_type = discrim(_temp); - return _strm; - } - - - class oneof - { - public: - private: - discrim _disc; - CORBA::Octet __o; - CORBA::Short __s; - CORBA::Long __l; - Cubit::Many __cm; - public: - oneof() : _disc(discrim(0)) {} - ~oneof() {} - oneof(const oneof& obj); - oneof& operator=(const oneof& obj); - - void _d(discrim val) { _disc = val; } - discrim _d() const { return _disc; } - - void o(CORBA::Octet val) { - __o = val; - _disc = Cubit::e_0th; - } - CORBA::Octet o() const { return __o; } - - void s(CORBA::Short val) { - __s = val; - _disc = Cubit::e_1st; - } - CORBA::Short s() const { return __s; } - - void l(CORBA::Long val) { - __l = val; - _disc = Cubit::e_2nd; - } - CORBA::Long l() const { return __l; } - - void cm(const Cubit::Many& val) { - __cm = val; - _disc = Cubit::e_3rd; - } - const Cubit::Many& cm() const { return __cm; } - Cubit::Many& cm() { return __cm; } - - friend NCostream& operator<<(NCostream&, const oneof& ); - friend NCistream& operator>>(NCistream&, oneof& ); - friend ostream& operator<<(ostream&, const oneof&); - inline friend istream& operator>>(istream& strm, oneof& obj) { - NCistream istrm(strm); - strm >> obj; - return strm; - } - }; - - typedef oneof *oneof_ptr; - class oneof_var - { - public: - oneof_var() { _ptr = (oneof*)NULL;} - oneof_var(oneof *ptr) { - _ptr = ptr; - } - oneof_var(const oneof_var& var) { - _ptr = new oneof(*var._ptr); - } - ~oneof_var() { - if (_ptr != (oneof *)NULL) delete _ptr; - } - oneof_var& operator=(oneof *ptr) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - oneof_var& operator=(const oneof_var& var) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = new oneof(*var._ptr); - return *this; - } - oneof *operator->() { return _ptr; } - operator oneof () const { return *_ptr; } - operator oneof& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const oneof_var& var) { - if (var._ptr == (oneof *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - oneof_var& var) { - if ( ! var._ptr) - var._ptr = new oneof; - strm >> *var._ptr; - return strm; - } - private: - oneof *_ptr; - }; - - - virtual Cubit::oneof cube_union(const Cubit::oneof& values); - - virtual void please_exit(); - - inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { - CORBA::Object_var _obj(obj); - _obj = CORBA::Object::_read(strm, Cubit::_desc()); - obj = Cubit::_narrow(_obj); - return strm; - } - inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { - strm << (CORBA::Object_ptr)obj; - return strm; - } - inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { - NCistream istrm(strm); - istrm >> obj; - return strm; - } + } + static Cubit_ptr _bind(const char *object_name = NULL, + const char *host_name = NULL, + const CORBA::BindOptions* opt = NULL); + + virtual CORBA::Octet cube_octet(CORBA::Octet o); + + virtual CORBA::Short cube_short(CORBA::Short s); + + virtual CORBA::Long cube_long(CORBA::Long l); + + struct Many { + CORBA::Octet o; + CORBA::Long l; + CORBA::Short s; + }; + friend NCostream& operator<<(NCostream&, const Many& ); + friend NCistream& operator>>(NCistream&, Many& ); + + friend ostream& operator<<(ostream&, const Many& ); + inline friend istream& operator>>(istream& _strm, Many& _obj) { + NCistream _istrm(_strm); + _istrm >> _obj; + return _strm; + } + + + typedef Many *Many_ptr; + class Many_var + { + public: + Many_var() { _ptr = (Many*)NULL;} + Many_var(Many *ptr) { + _ptr = ptr; + } + Many_var(const Many_var& var) { + if (var._ptr) + _ptr = new Many(*var._ptr); + else + _ptr = (Many *)NULL; + } + ~Many_var() { + if (_ptr != (Many *)NULL) delete _ptr; + } + Many_var& operator=(Many *ptr) { + if (_ptr != (Many *)NULL) delete _ptr; + _ptr = ptr; + return *this; + } + Many_var& operator=(const Many_var& var) { + if (_ptr != (Many *)NULL) delete _ptr; + if (var._ptr) + _ptr = new Many(*var._ptr); + else + _ptr = (Many *)NULL; + return *this; + } + Many *operator->() { return _ptr; } + operator Many () const { return *_ptr; } + operator Many& () { return *_ptr; } + inline friend NCostream& operator<<(NCostream& strm, + const Many_var& var) { + if (var._ptr == (Many *)NULL) { + throw CORBA::BAD_PARAM(); + } + else + strm << *var._ptr; + return strm; + } + inline friend NCistream& operator>>(NCistream& strm, + Many_var& var) { + if ( ! var._ptr) + var._ptr = new Many; + strm >> *var._ptr; + return strm; + } + private: + Many *_ptr; + }; + + + virtual Cubit::Many cube_struct(const Cubit::Many& values); + + enum discrim { + e_0th, + e_1st, + e_2nd, + e_3rd, + e_4th, + e_5th + }; + inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { + _strm << (CORBA::ULong)_enum_type; + return _strm; + } + inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { + CORBA::ULong _temp; + _strm >> _temp; + if (_temp >= 6) + throw CORBA::BAD_PARAM(); + _enum_type = discrim(_temp); + return _strm; + } + inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { + if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { + _strm << "discrim:"; + switch(_enum_type) { + case e_0th: + _strm << "e_0th" << endl; + break; + case e_1st: + _strm << "e_1st" << endl; + break; + case e_2nd: + _strm << "e_2nd" << endl; + break; + case e_3rd: + _strm << "e_3rd" << endl; + break; + case e_4th: + _strm << "e_4th" << endl; + break; + case e_5th: + _strm << "e_5th" << endl; + break; + } + } + else + _strm << (CORBA::ULong)_enum_type; + return _strm; + } + inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { + CORBA::ULong _temp; + _strm >> _temp; + _enum_type = discrim(_temp); + return _strm; + } + + + class oneof + { + public: + private: + discrim _disc; + CORBA::Octet __o; + CORBA::Short __s; + CORBA::Long __l; + Cubit::Many __cm; + public: + oneof() : _disc(discrim(0)) {} + ~oneof() {} + oneof(const oneof& obj); + oneof& operator=(const oneof& obj); + + void _d(discrim val) { _disc = val; } + discrim _d() const { return _disc; } + + void o(CORBA::Octet val) { + __o = val; + _disc = Cubit::e_0th; + } + CORBA::Octet o() const { return __o; } + + void s(CORBA::Short val) { + __s = val; + _disc = Cubit::e_1st; + } + CORBA::Short s() const { return __s; } + + void l(CORBA::Long val) { + __l = val; + _disc = Cubit::e_2nd; + } + CORBA::Long l() const { return __l; } + + void cm(const Cubit::Many& val) { + __cm = val; + _disc = Cubit::e_3rd; + } + const Cubit::Many& cm() const { return __cm; } + Cubit::Many& cm() { return __cm; } + + friend NCostream& operator<<(NCostream&, const oneof& ); + friend NCistream& operator>>(NCistream&, oneof& ); + friend ostream& operator<<(ostream&, const oneof&); + inline friend istream& operator>>(istream& strm, oneof& obj) { + NCistream istrm(strm); + strm >> obj; + return strm; + } + }; + + typedef oneof *oneof_ptr; + class oneof_var + { + public: + oneof_var() { _ptr = (oneof*)NULL;} + oneof_var(oneof *ptr) { + _ptr = ptr; + } + oneof_var(const oneof_var& var) { + _ptr = new oneof(*var._ptr); + } + ~oneof_var() { + if (_ptr != (oneof *)NULL) delete _ptr; + } + oneof_var& operator=(oneof *ptr) { + if (_ptr != (oneof *)NULL) delete _ptr; + _ptr = ptr; + return *this; + } + oneof_var& operator=(const oneof_var& var) { + if (_ptr != (oneof *)NULL) delete _ptr; + _ptr = new oneof(*var._ptr); + return *this; + } + oneof *operator->() { return _ptr; } + operator oneof () const { return *_ptr; } + operator oneof& () { return *_ptr; } + inline friend NCostream& operator<<(NCostream& strm, + const oneof_var& var) { + if (var._ptr == (oneof *)NULL) { + throw CORBA::BAD_PARAM(); + } + else + strm << *var._ptr; + return strm; + } + inline friend NCistream& operator>>(NCistream& strm, + oneof_var& var) { + if ( ! var._ptr) + var._ptr = new oneof; + strm >> *var._ptr; + return strm; + } + private: + oneof *_ptr; + }; + + + virtual Cubit::oneof cube_union(const Cubit::oneof& values); + + virtual void please_exit(); + + inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { + CORBA::Object_var _obj(obj); + _obj = CORBA::Object::_read(strm, Cubit::_desc()); + obj = Cubit::_narrow(_obj); + return strm; + } + inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { + strm << (CORBA::Object_ptr)obj; + return strm; + } + inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { + NCistream istrm(strm); + istrm >> obj; + return strm; + } }; diff --git a/TAO/IIOP/test/Orbix/base_server/cubitS.h b/TAO/IIOP/test/Orbix/base_server/cubitS.h index 3ca717e2b49..7132e9d229c 100644 --- a/TAO/IIOP/test/Orbix/base_server/cubitS.h +++ b/TAO/IIOP/test/Orbix/base_server/cubitS.h @@ -20,100 +20,100 @@ class _sk_Cubit : public Cubit { protected: - _sk_Cubit(const char *object_name = (const char *)NULL); - _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); - virtual ~_sk_Cubit() {} + _sk_Cubit(const char *object_name = (const char *)NULL); + _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); + virtual ~_sk_Cubit() {} public: - static const CORBA::TypeInfo _skel_info; - - // The following operations need to be implemented by the server. - virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; - virtual CORBA::Short cube_short(CORBA::Short s) = 0; - virtual CORBA::Long cube_long(CORBA::Long l) = 0; - virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; - virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; - virtual void please_exit() = 0; - - // Skeleton Operations implemented automatically - - static void _cube_octet(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_short(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_long(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_struct(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_union(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _please_exit(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - + static const CORBA::TypeInfo _skel_info; + + // The following operations need to be implemented by the server. + virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; + virtual CORBA::Short cube_short(CORBA::Short s) = 0; + virtual CORBA::Long cube_long(CORBA::Long l) = 0; + virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; + virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; + virtual void please_exit() = 0; + + // Skeleton Operations implemented automatically + + static void _cube_octet(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_short(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_long(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_struct(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_union(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _please_exit(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + }; template <class T> class _tie_Cubit : public Cubit { public: - _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : - Cubit(obj_name), - _ref(t) { - _object_name(obj_name); - } - _tie_Cubit(T& t, const char *service_name, - const CORBA::ReferenceData& id) - :_ref(t) { - _service(service_name, id); - } - ~_tie_Cubit() {} - CORBA::Octet cube_octet(CORBA::Octet o) { - return _ref.cube_octet( - o); - } - CORBA::Short cube_short(CORBA::Short s) { - return _ref.cube_short( - s); - } - CORBA::Long cube_long(CORBA::Long l) { - return _ref.cube_long( - l); - } - Cubit::Many cube_struct(const Cubit::Many& values) { - return _ref.cube_struct( - values); - } - Cubit::oneof cube_union(const Cubit::oneof& values) { - return _ref.cube_union( - values); - } - void please_exit() { - _ref.please_exit(); - } + _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : + Cubit(obj_name), + _ref(t) { + _object_name(obj_name); + } + _tie_Cubit(T& t, const char *service_name, + const CORBA::ReferenceData& id) + :_ref(t) { + _service(service_name, id); + } + ~_tie_Cubit() {} + CORBA::Octet cube_octet(CORBA::Octet o) { + return _ref.cube_octet( + o); + } + CORBA::Short cube_short(CORBA::Short s) { + return _ref.cube_short( + s); + } + CORBA::Long cube_long(CORBA::Long l) { + return _ref.cube_long( + l); + } + Cubit::Many cube_struct(const Cubit::Many& values) { + return _ref.cube_struct( + values); + } + Cubit::oneof cube_union(const Cubit::oneof& values) { + return _ref.cube_union( + values); + } + void please_exit() { + _ref.please_exit(); + } private: - T& _ref; + T& _ref; }; #endif diff --git a/TAO/IIOP/test/Orbix/base_server/tpr.h b/TAO/IIOP/test/Orbix/base_server/tpr.h index b5e8be94cf1..7912a2dc92c 100644 --- a/TAO/IIOP/test/Orbix/base_server/tpr.h +++ b/TAO/IIOP/test/Orbix/base_server/tpr.h @@ -2,11 +2,16 @@ #include "cubit.h" #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Thread_Manager.h" // // Create a thread filter to dispatch incoming calls // class tpr_filter : public CORBA::ThreadFilter { - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); + virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); }; diff --git a/TAO/IIOP/test/Orbix/client/cubit.h b/TAO/IIOP/test/Orbix/client/cubit.h index 1fd0a2d3c7d..37fb9f317d4 100644 --- a/TAO/IIOP/test/Orbix/client/cubit.h +++ b/TAO/IIOP/test/Orbix/client/cubit.h @@ -5,6 +5,11 @@ #define cubit_hh #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include <CORBA.h> @@ -13,7 +18,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -28,12 +33,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -92,12 +97,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -711,7 +716,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.h b/TAO/IIOP/test/Orbix/factory_client/cubit.h index 3a2dd546608..80e2c0590f5 100644 --- a/TAO/IIOP/test/Orbix/factory_client/cubit.h +++ b/TAO/IIOP/test/Orbix/factory_client/cubit.h @@ -14,7 +14,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -29,12 +29,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -93,12 +93,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -586,7 +586,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -602,76 +602,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -682,19 +682,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -712,7 +712,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; @@ -732,7 +732,7 @@ public: class Cubit_Factory_dispatch : public virtual CORBA::PPTR { public: - Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -747,12 +747,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -811,12 +811,12 @@ protected: } public: static Cubit_Factory_ptr _duplicate( - Cubit_Factory_ptr, + Cubit_Factory_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit_Factory* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit_Factory* _bind (CORBA::Environment &IT_env); static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -1014,7 +1014,7 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem } operator Cubit_Factory_ptr () const { - return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); + return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); } Cubit_Factory_ptr operator->() const { return *_ptr;} @@ -1030,36 +1030,36 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem #define TIE_Cubit_Factory(X) Cubit_Factory##X #define DEF_TIE_Cubit_Factory(X) \ - class Cubit_Factory##X : public virtual Cubit_Factory { \ - X* m_obj; \ - public: \ - \ - \ - Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit_Factory(), m_obj(objp) { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ - } \ - Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit_Factory() { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit_Factory##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit_Factory##X : public virtual Cubit_Factory { \ + X* m_obj; \ + public: \ + \ + \ + Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit_Factory(), m_obj(objp) { \ + m_pptr = new Cubit_Factory_dispatch \ + (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ + } \ + Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit_Factory() { \ + m_pptr = new Cubit_Factory_dispatch \ + (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit_Factory##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->create_cubit ( name,IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit_Factory \ +#define QUALS_Cubit_Factory \ virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->create_cubit ( name,IT_env);\ }\ @@ -1070,19 +1070,19 @@ return m_obj->create_cubit ( name,IT_env);\ class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -1100,7 +1100,7 @@ public: Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR)) m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this, - (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); + (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); } virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/test/Orbix/tpool/cubit.h b/TAO/IIOP/test/Orbix/tpool/cubit.h index 1fd0a2d3c7d..37fb9f317d4 100644 --- a/TAO/IIOP/test/Orbix/tpool/cubit.h +++ b/TAO/IIOP/test/Orbix/tpool/cubit.h @@ -5,6 +5,11 @@ #define cubit_hh #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include <CORBA.h> @@ -13,7 +18,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -28,12 +33,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -92,12 +97,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -711,7 +716,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/test/Orbix/tpool/tpool.h b/TAO/IIOP/test/Orbix/tpool/tpool.h index 337a7f54e65..536aeedad22 100644 --- a/TAO/IIOP/test/Orbix/tpool/tpool.h +++ b/TAO/IIOP/test/Orbix/tpool/tpool.h @@ -2,6 +2,11 @@ #include "cubit.h" #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Thread_Manager.h" #include "ace/Task.h" diff --git a/TAO/IIOP/test/Orbix/tpr/cubit.h b/TAO/IIOP/test/Orbix/tpr/cubit.h index 1fd0a2d3c7d..37fb9f317d4 100644 --- a/TAO/IIOP/test/Orbix/tpr/cubit.h +++ b/TAO/IIOP/test/Orbix/tpr/cubit.h @@ -5,6 +5,11 @@ #define cubit_hh #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include <CORBA.h> @@ -13,7 +18,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -28,12 +33,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -92,12 +97,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -711,7 +716,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/test/Orbix/tpr/cubitC.h b/TAO/IIOP/test/Orbix/tpr/cubitC.h index 584efa67c8d..5c020bd0c4b 100644 --- a/TAO/IIOP/test/Orbix/tpr/cubitC.h +++ b/TAO/IIOP/test/Orbix/tpr/cubitC.h @@ -28,316 +28,316 @@ typedef Cubit_ptr CubitRef; class Cubit_var { public: - Cubit_var(); - Cubit_var(Cubit_ptr); - Cubit_var(const Cubit_var&); - ~Cubit_var(); - Cubit_var& operator=(Cubit_ptr); - operator Cubit_ptr() const { return _ptr; } + Cubit_var(); + Cubit_var(Cubit_ptr); + Cubit_var(const Cubit_var&); + ~Cubit_var(); + Cubit_var& operator=(Cubit_ptr); + operator Cubit_ptr() const { return _ptr; } #if defined(_HPCC_BUG) - operator Cubit *&() { return _ptr; } + operator Cubit *&() { return _ptr; } #else - operator Cubit_ptr&() { return _ptr; } + operator Cubit_ptr&() { return _ptr; } #endif - Cubit_ptr operator->() const { return _ptr;} - friend NCistream& operator>>(NCistream&, Cubit_var&); - friend NCostream& operator<<(NCostream&, const Cubit_var&); - friend istream& operator>>(istream&, Cubit_var&); - friend ostream& operator<<(ostream&, const Cubit_var&); + Cubit_ptr operator->() const { return _ptr;} + friend NCistream& operator>>(NCistream&, Cubit_var&); + friend NCostream& operator<<(NCostream&, const Cubit_var&); + friend istream& operator>>(istream&, Cubit_var&); + friend ostream& operator<<(ostream&, const Cubit_var&); private: - Cubit_ptr _ptr; - void operator=(const Cubit_var&) {} + Cubit_ptr _ptr; + void operator=(const Cubit_var&) {} }; #endif class Cubit: public virtual CORBA_Object { private: - static const CORBA::TypeInfo _class_info; - Cubit(const Cubit&) {} - void operator=(const Cubit&){} + static const CORBA::TypeInfo _class_info; + Cubit(const Cubit&) {} + void operator=(const Cubit&){} public: - static const CORBA::TypeInfo *_desc(); - virtual const CORBA::TypeInfo *_type_info() const; - virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; - static CORBA::Object *_factory(); + static const CORBA::TypeInfo *_desc(); + virtual const CORBA::TypeInfo *_type_info() const; + virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; + static CORBA::Object *_factory(); protected: - Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} - Cubit(NCistream& strm) :CORBA_Object(strm) {} - virtual ~Cubit() {} + Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} + Cubit(NCistream& strm) :CORBA_Object(strm) {} + virtual ~Cubit() {} public: - static Cubit_ptr _duplicate(Cubit_ptr obj) { - if (obj ) obj->_ref(); - return obj; - } - static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} - static Cubit_ptr _narrow(CORBA::Object *obj); - static Cubit_ptr _clone(Cubit_ptr obj) { - CORBA::Object_var obj_var(__clone(obj)); + static Cubit_ptr _duplicate(Cubit_ptr obj) { + if (obj ) obj->_ref(); + return obj; + } + static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} + static Cubit_ptr _narrow(CORBA::Object *obj); + static Cubit_ptr _clone(Cubit_ptr obj) { + CORBA::Object_var obj_var(__clone(obj)); #if defined(_HPCC_BUG) - return _narrow(obj_var.operator CORBA::Object_ptr()); + return _narrow(obj_var.operator CORBA::Object_ptr()); #else - return _narrow(obj_var); + return _narrow(obj_var); #endif - } - static Cubit_ptr _bind(const char *object_name = NULL, - const char *host_name = NULL, - const CORBA::BindOptions* opt = NULL); - - virtual CORBA::Octet cube_octet(CORBA::Octet o); - - virtual CORBA::Short cube_short(CORBA::Short s); - - virtual CORBA::Long cube_long(CORBA::Long l); - - struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - }; - friend NCostream& operator<<(NCostream&, const Many& ); - friend NCistream& operator>>(NCistream&, Many& ); - - friend ostream& operator<<(ostream&, const Many& ); - inline friend istream& operator>>(istream& _strm, Many& _obj) { - NCistream _istrm(_strm); - _istrm >> _obj; - return _strm; - } - - - typedef Many *Many_ptr; - class Many_var - { - public: - Many_var() { _ptr = (Many*)NULL;} - Many_var(Many *ptr) { - _ptr = ptr; - } - Many_var(const Many_var& var) { - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - } - ~Many_var() { - if (_ptr != (Many *)NULL) delete _ptr; - } - Many_var& operator=(Many *ptr) { - if (_ptr != (Many *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - Many_var& operator=(const Many_var& var) { - if (_ptr != (Many *)NULL) delete _ptr; - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - return *this; - } - Many *operator->() { return _ptr; } - operator Many () const { return *_ptr; } - operator Many& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const Many_var& var) { - if (var._ptr == (Many *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - Many_var& var) { - if ( ! var._ptr) - var._ptr = new Many; - strm >> *var._ptr; - return strm; - } - private: - Many *_ptr; - }; - - - virtual Cubit::Many cube_struct(const Cubit::Many& values); - - enum discrim { - e_0th, - e_1st, - e_2nd, - e_3rd, - e_4th, - e_5th - }; - inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - if (_temp >= 6) - throw CORBA::BAD_PARAM(); - _enum_type = discrim(_temp); - return _strm; - } - inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { - if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { - _strm << "discrim:"; - switch(_enum_type) { - case e_0th: - _strm << "e_0th" << endl; - break; - case e_1st: - _strm << "e_1st" << endl; - break; - case e_2nd: - _strm << "e_2nd" << endl; - break; - case e_3rd: - _strm << "e_3rd" << endl; - break; - case e_4th: - _strm << "e_4th" << endl; - break; - case e_5th: - _strm << "e_5th" << endl; - break; - } - } - else - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - _enum_type = discrim(_temp); - return _strm; - } - - - class oneof - { - public: - private: - discrim _disc; - CORBA::Octet __o; - CORBA::Short __s; - CORBA::Long __l; - Cubit::Many __cm; - public: - oneof() : _disc(discrim(0)) {} - ~oneof() {} - oneof(const oneof& obj); - oneof& operator=(const oneof& obj); - - void _d(discrim val) { _disc = val; } - discrim _d() const { return _disc; } - - void o(CORBA::Octet val) { - __o = val; - _disc = Cubit::e_0th; - } - CORBA::Octet o() const { return __o; } - - void s(CORBA::Short val) { - __s = val; - _disc = Cubit::e_1st; - } - CORBA::Short s() const { return __s; } - - void l(CORBA::Long val) { - __l = val; - _disc = Cubit::e_2nd; - } - CORBA::Long l() const { return __l; } - - void cm(const Cubit::Many& val) { - __cm = val; - _disc = Cubit::e_3rd; - } - const Cubit::Many& cm() const { return __cm; } - Cubit::Many& cm() { return __cm; } - - friend NCostream& operator<<(NCostream&, const oneof& ); - friend NCistream& operator>>(NCistream&, oneof& ); - friend ostream& operator<<(ostream&, const oneof&); - inline friend istream& operator>>(istream& strm, oneof& obj) { - NCistream istrm(strm); - strm >> obj; - return strm; - } - }; - - typedef oneof *oneof_ptr; - class oneof_var - { - public: - oneof_var() { _ptr = (oneof*)NULL;} - oneof_var(oneof *ptr) { - _ptr = ptr; - } - oneof_var(const oneof_var& var) { - _ptr = new oneof(*var._ptr); - } - ~oneof_var() { - if (_ptr != (oneof *)NULL) delete _ptr; - } - oneof_var& operator=(oneof *ptr) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - oneof_var& operator=(const oneof_var& var) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = new oneof(*var._ptr); - return *this; - } - oneof *operator->() { return _ptr; } - operator oneof () const { return *_ptr; } - operator oneof& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const oneof_var& var) { - if (var._ptr == (oneof *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - oneof_var& var) { - if ( ! var._ptr) - var._ptr = new oneof; - strm >> *var._ptr; - return strm; - } - private: - oneof *_ptr; - }; - - - virtual Cubit::oneof cube_union(const Cubit::oneof& values); - - virtual void please_exit(); - - inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { - CORBA::Object_var _obj(obj); - _obj = CORBA::Object::_read(strm, Cubit::_desc()); - obj = Cubit::_narrow(_obj); - return strm; - } - inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { - strm << (CORBA::Object_ptr)obj; - return strm; - } - inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { - NCistream istrm(strm); - istrm >> obj; - return strm; - } + } + static Cubit_ptr _bind(const char *object_name = NULL, + const char *host_name = NULL, + const CORBA::BindOptions* opt = NULL); + + virtual CORBA::Octet cube_octet(CORBA::Octet o); + + virtual CORBA::Short cube_short(CORBA::Short s); + + virtual CORBA::Long cube_long(CORBA::Long l); + + struct Many { + CORBA::Octet o; + CORBA::Long l; + CORBA::Short s; + }; + friend NCostream& operator<<(NCostream&, const Many& ); + friend NCistream& operator>>(NCistream&, Many& ); + + friend ostream& operator<<(ostream&, const Many& ); + inline friend istream& operator>>(istream& _strm, Many& _obj) { + NCistream _istrm(_strm); + _istrm >> _obj; + return _strm; + } + + + typedef Many *Many_ptr; + class Many_var + { + public: + Many_var() { _ptr = (Many*)NULL;} + Many_var(Many *ptr) { + _ptr = ptr; + } + Many_var(const Many_var& var) { + if (var._ptr) + _ptr = new Many(*var._ptr); + else + _ptr = (Many *)NULL; + } + ~Many_var() { + if (_ptr != (Many *)NULL) delete _ptr; + } + Many_var& operator=(Many *ptr) { + if (_ptr != (Many *)NULL) delete _ptr; + _ptr = ptr; + return *this; + } + Many_var& operator=(const Many_var& var) { + if (_ptr != (Many *)NULL) delete _ptr; + if (var._ptr) + _ptr = new Many(*var._ptr); + else + _ptr = (Many *)NULL; + return *this; + } + Many *operator->() { return _ptr; } + operator Many () const { return *_ptr; } + operator Many& () { return *_ptr; } + inline friend NCostream& operator<<(NCostream& strm, + const Many_var& var) { + if (var._ptr == (Many *)NULL) { + throw CORBA::BAD_PARAM(); + } + else + strm << *var._ptr; + return strm; + } + inline friend NCistream& operator>>(NCistream& strm, + Many_var& var) { + if ( ! var._ptr) + var._ptr = new Many; + strm >> *var._ptr; + return strm; + } + private: + Many *_ptr; + }; + + + virtual Cubit::Many cube_struct(const Cubit::Many& values); + + enum discrim { + e_0th, + e_1st, + e_2nd, + e_3rd, + e_4th, + e_5th + }; + inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { + _strm << (CORBA::ULong)_enum_type; + return _strm; + } + inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { + CORBA::ULong _temp; + _strm >> _temp; + if (_temp >= 6) + throw CORBA::BAD_PARAM(); + _enum_type = discrim(_temp); + return _strm; + } + inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { + if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { + _strm << "discrim:"; + switch(_enum_type) { + case e_0th: + _strm << "e_0th" << endl; + break; + case e_1st: + _strm << "e_1st" << endl; + break; + case e_2nd: + _strm << "e_2nd" << endl; + break; + case e_3rd: + _strm << "e_3rd" << endl; + break; + case e_4th: + _strm << "e_4th" << endl; + break; + case e_5th: + _strm << "e_5th" << endl; + break; + } + } + else + _strm << (CORBA::ULong)_enum_type; + return _strm; + } + inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { + CORBA::ULong _temp; + _strm >> _temp; + _enum_type = discrim(_temp); + return _strm; + } + + + class oneof + { + public: + private: + discrim _disc; + CORBA::Octet __o; + CORBA::Short __s; + CORBA::Long __l; + Cubit::Many __cm; + public: + oneof() : _disc(discrim(0)) {} + ~oneof() {} + oneof(const oneof& obj); + oneof& operator=(const oneof& obj); + + void _d(discrim val) { _disc = val; } + discrim _d() const { return _disc; } + + void o(CORBA::Octet val) { + __o = val; + _disc = Cubit::e_0th; + } + CORBA::Octet o() const { return __o; } + + void s(CORBA::Short val) { + __s = val; + _disc = Cubit::e_1st; + } + CORBA::Short s() const { return __s; } + + void l(CORBA::Long val) { + __l = val; + _disc = Cubit::e_2nd; + } + CORBA::Long l() const { return __l; } + + void cm(const Cubit::Many& val) { + __cm = val; + _disc = Cubit::e_3rd; + } + const Cubit::Many& cm() const { return __cm; } + Cubit::Many& cm() { return __cm; } + + friend NCostream& operator<<(NCostream&, const oneof& ); + friend NCistream& operator>>(NCistream&, oneof& ); + friend ostream& operator<<(ostream&, const oneof&); + inline friend istream& operator>>(istream& strm, oneof& obj) { + NCistream istrm(strm); + strm >> obj; + return strm; + } + }; + + typedef oneof *oneof_ptr; + class oneof_var + { + public: + oneof_var() { _ptr = (oneof*)NULL;} + oneof_var(oneof *ptr) { + _ptr = ptr; + } + oneof_var(const oneof_var& var) { + _ptr = new oneof(*var._ptr); + } + ~oneof_var() { + if (_ptr != (oneof *)NULL) delete _ptr; + } + oneof_var& operator=(oneof *ptr) { + if (_ptr != (oneof *)NULL) delete _ptr; + _ptr = ptr; + return *this; + } + oneof_var& operator=(const oneof_var& var) { + if (_ptr != (oneof *)NULL) delete _ptr; + _ptr = new oneof(*var._ptr); + return *this; + } + oneof *operator->() { return _ptr; } + operator oneof () const { return *_ptr; } + operator oneof& () { return *_ptr; } + inline friend NCostream& operator<<(NCostream& strm, + const oneof_var& var) { + if (var._ptr == (oneof *)NULL) { + throw CORBA::BAD_PARAM(); + } + else + strm << *var._ptr; + return strm; + } + inline friend NCistream& operator>>(NCistream& strm, + oneof_var& var) { + if ( ! var._ptr) + var._ptr = new oneof; + strm >> *var._ptr; + return strm; + } + private: + oneof *_ptr; + }; + + + virtual Cubit::oneof cube_union(const Cubit::oneof& values); + + virtual void please_exit(); + + inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { + CORBA::Object_var _obj(obj); + _obj = CORBA::Object::_read(strm, Cubit::_desc()); + obj = Cubit::_narrow(_obj); + return strm; + } + inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { + strm << (CORBA::Object_ptr)obj; + return strm; + } + inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { + NCistream istrm(strm); + istrm >> obj; + return strm; + } }; diff --git a/TAO/IIOP/test/Orbix/tpr/cubitS.h b/TAO/IIOP/test/Orbix/tpr/cubitS.h index 3ca717e2b49..7132e9d229c 100644 --- a/TAO/IIOP/test/Orbix/tpr/cubitS.h +++ b/TAO/IIOP/test/Orbix/tpr/cubitS.h @@ -20,100 +20,100 @@ class _sk_Cubit : public Cubit { protected: - _sk_Cubit(const char *object_name = (const char *)NULL); - _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); - virtual ~_sk_Cubit() {} + _sk_Cubit(const char *object_name = (const char *)NULL); + _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); + virtual ~_sk_Cubit() {} public: - static const CORBA::TypeInfo _skel_info; - - // The following operations need to be implemented by the server. - virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; - virtual CORBA::Short cube_short(CORBA::Short s) = 0; - virtual CORBA::Long cube_long(CORBA::Long l) = 0; - virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; - virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; - virtual void please_exit() = 0; - - // Skeleton Operations implemented automatically - - static void _cube_octet(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_short(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_long(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_struct(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_union(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _please_exit(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - + static const CORBA::TypeInfo _skel_info; + + // The following operations need to be implemented by the server. + virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; + virtual CORBA::Short cube_short(CORBA::Short s) = 0; + virtual CORBA::Long cube_long(CORBA::Long l) = 0; + virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; + virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; + virtual void please_exit() = 0; + + // Skeleton Operations implemented automatically + + static void _cube_octet(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_short(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_long(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_struct(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_union(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _please_exit(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + }; template <class T> class _tie_Cubit : public Cubit { public: - _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : - Cubit(obj_name), - _ref(t) { - _object_name(obj_name); - } - _tie_Cubit(T& t, const char *service_name, - const CORBA::ReferenceData& id) - :_ref(t) { - _service(service_name, id); - } - ~_tie_Cubit() {} - CORBA::Octet cube_octet(CORBA::Octet o) { - return _ref.cube_octet( - o); - } - CORBA::Short cube_short(CORBA::Short s) { - return _ref.cube_short( - s); - } - CORBA::Long cube_long(CORBA::Long l) { - return _ref.cube_long( - l); - } - Cubit::Many cube_struct(const Cubit::Many& values) { - return _ref.cube_struct( - values); - } - Cubit::oneof cube_union(const Cubit::oneof& values) { - return _ref.cube_union( - values); - } - void please_exit() { - _ref.please_exit(); - } + _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : + Cubit(obj_name), + _ref(t) { + _object_name(obj_name); + } + _tie_Cubit(T& t, const char *service_name, + const CORBA::ReferenceData& id) + :_ref(t) { + _service(service_name, id); + } + ~_tie_Cubit() {} + CORBA::Octet cube_octet(CORBA::Octet o) { + return _ref.cube_octet( + o); + } + CORBA::Short cube_short(CORBA::Short s) { + return _ref.cube_short( + s); + } + CORBA::Long cube_long(CORBA::Long l) { + return _ref.cube_long( + l); + } + Cubit::Many cube_struct(const Cubit::Many& values) { + return _ref.cube_struct( + values); + } + Cubit::oneof cube_union(const Cubit::oneof& values) { + return _ref.cube_union( + values); + } + void please_exit() { + _ref.please_exit(); + } private: - T& _ref; + T& _ref; }; #endif diff --git a/TAO/IIOP/test/Orbix/tpr/tpr.h b/TAO/IIOP/test/Orbix/tpr/tpr.h index b5e8be94cf1..7912a2dc92c 100644 --- a/TAO/IIOP/test/Orbix/tpr/tpr.h +++ b/TAO/IIOP/test/Orbix/tpr/tpr.h @@ -2,11 +2,16 @@ #include "cubit.h" #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Thread_Manager.h" // // Create a thread filter to dispatch incoming calls // class tpr_filter : public CORBA::ThreadFilter { - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); + virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); }; diff --git a/TAO/IIOP/test/Orbix/tps/cubit.h b/TAO/IIOP/test/Orbix/tps/cubit.h index 3a2dd546608..80e2c0590f5 100644 --- a/TAO/IIOP/test/Orbix/tps/cubit.h +++ b/TAO/IIOP/test/Orbix/tps/cubit.h @@ -14,7 +14,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -29,12 +29,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -93,12 +93,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -586,7 +586,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -602,76 +602,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -682,19 +682,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -712,7 +712,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; @@ -732,7 +732,7 @@ public: class Cubit_Factory_dispatch : public virtual CORBA::PPTR { public: - Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -747,12 +747,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -811,12 +811,12 @@ protected: } public: static Cubit_Factory_ptr _duplicate( - Cubit_Factory_ptr, + Cubit_Factory_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit_Factory* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit_Factory* _bind (CORBA::Environment &IT_env); static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -1014,7 +1014,7 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem } operator Cubit_Factory_ptr () const { - return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); + return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); } Cubit_Factory_ptr operator->() const { return *_ptr;} @@ -1030,36 +1030,36 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem #define TIE_Cubit_Factory(X) Cubit_Factory##X #define DEF_TIE_Cubit_Factory(X) \ - class Cubit_Factory##X : public virtual Cubit_Factory { \ - X* m_obj; \ - public: \ - \ - \ - Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit_Factory(), m_obj(objp) { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ - } \ - Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit_Factory() { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit_Factory##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit_Factory##X : public virtual Cubit_Factory { \ + X* m_obj; \ + public: \ + \ + \ + Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit_Factory(), m_obj(objp) { \ + m_pptr = new Cubit_Factory_dispatch \ + (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ + } \ + Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit_Factory() { \ + m_pptr = new Cubit_Factory_dispatch \ + (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit_Factory##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->create_cubit ( name,IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit_Factory \ +#define QUALS_Cubit_Factory \ virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->create_cubit ( name,IT_env);\ }\ @@ -1070,19 +1070,19 @@ return m_obj->create_cubit ( name,IT_env);\ class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -1100,7 +1100,7 @@ public: Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR)) m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this, - (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); + (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); } virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/test/Orbix/tps/cubit_impl.h b/TAO/IIOP/test/Orbix/tps/cubit_impl.h index 0fea9857af3..13e65492916 100644 --- a/TAO/IIOP/test/Orbix/tps/cubit_impl.h +++ b/TAO/IIOP/test/Orbix/tps/cubit_impl.h @@ -7,6 +7,10 @@ #include "cubit.h" #include "ace/Task.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #ifdef Cubit_USE_BOA class Cubit_Impl : public virtual CubitBOAImpl { #else diff --git a/TAO/IIOP/test/Orbix/tps/tps.h b/TAO/IIOP/test/Orbix/tps/tps.h index 362c9ed4e91..169b44dfd62 100644 --- a/TAO/IIOP/test/Orbix/tps/tps.h +++ b/TAO/IIOP/test/Orbix/tps/tps.h @@ -3,6 +3,11 @@ #include "cubit.h" #include "cubit_impl.h" #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Thread_Manager.h" #include "ace/Task.h" diff --git a/TAO/IIOP/test/cubit.h b/TAO/IIOP/test/cubit.h index 78d6b604052..12d99b4e403 100644 --- a/TAO/IIOP/test/cubit.h +++ b/TAO/IIOP/test/cubit.h @@ -1,6 +1,6 @@ // $Id$ -// @(#)cubit.hh 1.1 95/09/10 +// @(#)cubit.hh 1.1 95/09/10 // Copyright 1994-1995 by Sun Microsystems Inc. // All Rights Reserved // @@ -15,12 +15,12 @@ // mean lots of narrowing/widening/RTTI infrastructure. // -#ifndef _CUBIT_HH -#define _CUBIT_HH +#ifndef _CUBIT_HH +#define _CUBIT_HH -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (push, 1) // VC++, known padding rules +#endif // VC++ #include <corba/orb.h> #include <corba/stub.h> @@ -30,16 +30,16 @@ // C style binding // -typedef CORBA_Object Cubit; +typedef CORBA_Object Cubit; typedef Cubit *Cubit_ptr, *CubitRef; -extern CORBA_TypeCode_ptr TC_Cubit_Many; -extern CORBA_TypeCode_ptr TC_Cubit_oneof; +extern CORBA_TypeCode_ptr TC_Cubit_Many; +extern CORBA_TypeCode_ptr TC_Cubit_oneof; struct Cubit_Many { - CORBA_Octet o; - CORBA_Long l; - CORBA_Short s; + CORBA_Octet o; + CORBA_Long l; + CORBA_Short s; }; enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2, @@ -48,61 +48,61 @@ enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2, struct Cubit_oneof { Cubit_discrim _disc; - union { - CORBA_Octet o; - CORBA_Short s; - CORBA_Long l; + union { + CORBA_Octet o; + CORBA_Short s; + CORBA_Long l; Cubit_Many cm; }; }; CORBA_Octet Cubit_cube_octet ( - Cubit_ptr target, - CORBA_Octet o, - CORBA_Environment &env + Cubit_ptr target, + CORBA_Octet o, + CORBA_Environment &env ); CORBA_Short Cubit_cube_short ( - Cubit_ptr target, - CORBA_Short s, - CORBA_Environment &env + Cubit_ptr target, + CORBA_Short s, + CORBA_Environment &env ); CORBA_Long Cubit_cube_long ( - Cubit_ptr target, - CORBA_Long l, - CORBA_Environment &env + Cubit_ptr target, + CORBA_Long l, + CORBA_Environment &env ); Cubit_Many * Cubit_cube_struct ( - Cubit_ptr target, - Cubit_Many &values, - CORBA_Environment &env + Cubit_ptr target, + Cubit_Many &values, + CORBA_Environment &env ); Cubit_oneof * Cubit_cube_union ( - Cubit_ptr target, + Cubit_ptr target, Cubit_oneof &values, - CORBA_Environment &env + CORBA_Environment &env ); void Cubit_please_exit ( - Cubit_ptr target, - CORBA_Environment &env + Cubit_ptr target, + CORBA_Environment &env ); -extern const CORBA_Char *Cubit__id; // type ID +extern const CORBA_Char *Cubit__id; // type ID extern const TAO_Skel_Entry Cubit_operations []; -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (pop) // VC++, go back to other padding rules +#endif // VC++ -#endif // _CUBIT_HH +#endif // _CUBIT_HH diff --git a/TAO/IIOP/test/cubitC.h b/TAO/IIOP/test/cubitC.h index 98610b55116..e80a1378bdb 100644 --- a/TAO/IIOP/test/cubitC.h +++ b/TAO/IIOP/test/cubitC.h @@ -9,25 +9,25 @@ /************************************************************************** This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation +implementation ***************************************************************************/ -#ifndef _CUBIT_HH -#define _CUBIT_HH +#ifndef _CUBIT_HH +#define _CUBIT_HH -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (push, 1) // VC++, known padding rules +#endif // VC++ #include "corba/orb.h" #include "corba/stub.h" #include <iostream.h> -extern CORBA_TypeCode_ptr TC_Cubit_Many; -extern CORBA_TypeCode_ptr TC_Cubit_oneof; +extern CORBA_TypeCode_ptr TC_Cubit_Many; +extern CORBA_TypeCode_ptr TC_Cubit_oneof; -struct Cubit_Many +struct Cubit_Many { CORBA_Octet o; CORBA_Long l; @@ -38,12 +38,12 @@ enum Cubit_discrim { e_0th = 0, e_1st = 1, e_2nd = 2, e_3rd = 3, e_4th = 4, e_5th = 5 }; -struct Cubit_oneof +struct Cubit_oneof { Cubit_discrim _disc; - - union - { + + union + { CORBA_Octet o; CORBA_Short s; CORBA_Long l; @@ -58,32 +58,32 @@ typedef Cubit_ptr Cubit_ref; class Cubit : public virtual CORBA_Object { public: - + static Cubit_ptr _duplicate(Cubit_ptr obj); static Cubit_ptr _narrow(CORBA_Object_ptr obj); static Cubit_ptr _nil(); - virtual + virtual CORBA_Octet Cubit_cube_octet (CORBA_Octet o, CORBA_Environment &env); - virtual + virtual CORBA_Short Cubit_cube_short (CORBA_Short s, CORBA_Environment &env); - - virtual + + virtual CORBA_Long Cubit_cube_long (CORBA_Long l, CORBA_Environment &env); - - virtual + + virtual Cubit_Many* Cubit_cube_struct (Cubit_Many &values, CORBA_Environment &env); - - virtual + + virtual Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, CORBA_Environment &env); - - virtual + + virtual void Cubit_please_exit (CORBA_Environment &env); protected: @@ -92,13 +92,13 @@ protected: : CORBA_Object(objref) { } virtual ~Cubit() { } - + }; -extern const CORBA_Char *Cubit__id; // type ID +extern const CORBA_Char *Cubit__id; // type ID -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (pop) // VC++, go back to other padding rules +#endif // VC++ -#endif // _CUBIT_HH +#endif // _CUBIT_HH diff --git a/TAO/IIOP/test/cubitS.h b/TAO/IIOP/test/cubitS.h index a4b4b853901..a35eeba4714 100644 --- a/TAO/IIOP/test/cubitS.h +++ b/TAO/IIOP/test/cubitS.h @@ -9,11 +9,11 @@ /************************************************************************** This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation +implementation ***************************************************************************/ -#ifndef _SKEL_CUBIT_HH -#define _SKEL_CUBIT_HH +#ifndef _SKEL_CUBIT_HH +#define _SKEL_CUBIT_HH #include "cubitC.h" @@ -27,7 +27,7 @@ public: virtual CORBA_Octet Cubit_cube_octet (CORBA_Octet o, CORBA_Environment &env) = 0; - static + static void _cube_octet_skel(CORBA_ServerRequest &req, CORBA_Object_ptr obj, CORBA_Environment &env); @@ -35,7 +35,7 @@ public: virtual CORBA_Short Cubit_cube_short (CORBA_Short s, CORBA_Environment &env) = 0; - + static void _cube_short_skel (CORBA_ServerRequest &req, CORBA_Object_ptr obj, @@ -44,8 +44,8 @@ public: virtual CORBA_Long Cubit_cube_long (CORBA_Long l, CORBA_Environment &env) = 0; - - static + + static void _cube_long_skel (CORBA_ServerRequest &req, CORBA_Object_ptr obj, CORBA_Environment &env); @@ -53,25 +53,25 @@ public: virtual Cubit_Many* Cubit_cube_struct (Cubit_Many &values, CORBA_Environment &env) = 0; - - static + + static void _cube_struct_skel (CORBA_ServerRequest &req, CORBA_Object_ptr obj, CORBA_Environment &env); - virtual + virtual Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, CORBA_Environment &env) = 0; - - static + + static void _cube_union_skel (CORBA_ServerRequest &req, CORBA_Object_ptr obj, CORBA_Environment &env); - virtual + virtual void Cubit_please_exit (CORBA_Environment &env) = 0; - static + static void _please_exit_skel (CORBA_ServerRequest &req, CORBA_Object_ptr obj, CORBA_Environment &env); @@ -81,4 +81,4 @@ protected: }; -#endif // _SKEL_CUBIT_HH +#endif // _SKEL_CUBIT_HH diff --git a/TAO/IIOP/test/cubit_i.h b/TAO/IIOP/test/cubit_i.h index 7ddf1947cd3..5ae7d565be1 100644 --- a/TAO/IIOP/test/cubit_i.h +++ b/TAO/IIOP/test/cubit_i.h @@ -4,18 +4,18 @@ // Copyright 1994-1995 by Sun Microsystems Inc. // All Rights Reserved // -// TEST: hand-written Cubit Implementation +// TEST: hand-written Cubit Implementation // // Modified version of Cubit Example written by Sun Microsystems Inc. // Modified by: Brian Mendel /************************************************************************** This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation +implementation ***************************************************************************/ -#ifndef _CUBIT_I_HH -#define _CUBIT_I_HH +#ifndef _CUBIT_I_HH +#define _CUBIT_I_HH #include "cubitS.h" @@ -28,7 +28,7 @@ class Cubit_i : public _skel_Cubit public: Cubit_i(const char* obj_name = 0); ~Cubit_i(); - + virtual CORBA_Octet Cubit_cube_octet (CORBA_Octet o, CORBA_Environment &env); @@ -36,21 +36,21 @@ public: virtual CORBA_Short Cubit_cube_short (CORBA_Short s, CORBA_Environment &env); - + virtual CORBA_Long Cubit_cube_long (CORBA_Long l, CORBA_Environment &env); - + virtual Cubit_Many* Cubit_cube_struct (Cubit_Many &values, CORBA_Environment &env); - + virtual Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, CORBA_Environment &env); - + virtual void Cubit_please_exit (CORBA_Environment &env); }; -#endif // _CUBIT_I_HH +#endif // _CUBIT_I_HH diff --git a/TAO/IIOP/test/test1.h b/TAO/IIOP/test/test1.h index 63e409d36c3..513bffc82d7 100644 --- a/TAO/IIOP/test/test1.h +++ b/TAO/IIOP/test/test1.h @@ -1,41 +1,41 @@ // $Id$ -// @(#)test1.hh 1.2 95/09/12 +// @(#)test1.hh 1.2 95/09/12 // Copyright 1995 by Sun Microsystems, Inc. // All Rights Reserved // -// TEST interface for "test1" +// TEST interface for "test1" // -#ifndef _TEST1_HH -#define _TEST1_HH +#ifndef _TEST1_HH +#define _TEST1_HH #include <corba/orb.h> #include <corba/stub.h> -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (push, 1) // VC++, known padding rules +#endif // VC++ -typedef CORBA_UShort test1_ushort; -typedef CORBA_ULong test1_ulong; +typedef CORBA_UShort test1_ushort; +typedef CORBA_ULong test1_ulong; -typedef CORBA_LongLong test1_longlong; -typedef CORBA_ULongLong test1_ulonglong; -typedef CORBA_LongDouble test1_longdouble; +typedef CORBA_LongLong test1_longlong; +typedef CORBA_ULongLong test1_ulonglong; +typedef CORBA_LongDouble test1_longdouble; -typedef CORBA_Object test1; -typedef test1 *test1_ptr; +typedef CORBA_Object test1; +typedef test1 *test1_ptr; -#define DECL_TEST(typename, truetype) \ +#define DECL_TEST(typename, truetype) \ truetype \ test1_test_ ## typename ( \ - test1_ptr target, \ - truetype in_a1, \ - truetype &out_a2, \ - truetype &inout_a3, \ - CORBA_Environment &env \ + test1_ptr target, \ + truetype in_a1, \ + truetype &out_a2, \ + truetype &inout_a3, \ + CORBA_Environment &env \ ) void test_illegal (test1_ptr target, CORBA_Environment &env); @@ -53,11 +53,11 @@ DECL_TEST (octet, CORBA_Octet); CORBA_Any * test1_test_any ( - test1_ptr target, - const CORBA_Any &in_a1, - CORBA_Any *&out_a2, - CORBA_Any &inout_a3, - CORBA_Environment &env + test1_ptr target, + const CORBA_Any &in_a1, + CORBA_Any *&out_a2, + CORBA_Any &inout_a3, + CORBA_Environment &env ); DECL_TEST (TypeCode, CORBA_TypeCode_ptr); @@ -76,51 +76,51 @@ DECL_TEST (wstring, CORBA_WString); DECL_TEST (longdouble, CORBA_LongDouble); -#undef DECL_TEST +#undef DECL_TEST -extern CORBA_TypeCode_ptr _tc_test1_x1; +extern CORBA_TypeCode_ptr _tc_test1_x1; class test1_x1 : public CORBA_UserException { public: - CORBA_Long case_num; - - test1_x1 (CORBA_Long n) - : CORBA_UserException (_tc_test1_x1), case_num (n) - { } + CORBA_Long case_num; + + test1_x1 (CORBA_Long n) + : CORBA_UserException (_tc_test1_x1), case_num (n) + { } }; -extern CORBA_TypeCode_ptr _tc_test1_x2; +extern CORBA_TypeCode_ptr _tc_test1_x2; class test1_x2 : public CORBA_UserException { public: - CORBA_Object_ptr obj; - CORBA_Long case_num; + CORBA_Object_ptr obj; + CORBA_Long case_num; - test1_x2 (CORBA_Object_ptr obj1, - CORBA_Long n) - : CORBA_UserException (_tc_test1_x2), - obj (obj1), case_num (n) { } + test1_x2 (CORBA_Object_ptr obj1, + CORBA_Long n) + : CORBA_UserException (_tc_test1_x2), + obj (obj1), case_num (n) { } - ~test1_x2 () - { CORBA_release (obj); } + ~test1_x2 () + { CORBA_release (obj); } }; void test1_test_throw ( - test1_ptr target, - CORBA_Long case_num, - CORBA_Environment &env // throw (x1, x2) + test1_ptr target, + CORBA_Long case_num, + CORBA_Environment &env // throw (x1, x2) ); void test1_please_exit ( - test1_ptr target, - CORBA_Environment &env + test1_ptr target, + CORBA_Environment &env ); -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (pop) // VC++, go back to other padding rules +#endif // VC++ -#endif // _TEST1_HH +#endif // _TEST1_HH diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h index 1fd0a2d3c7d..37fb9f317d4 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h +++ b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h @@ -5,6 +5,11 @@ #define cubit_hh #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include <CORBA.h> @@ -13,7 +18,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -28,12 +33,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -92,12 +97,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -711,7 +716,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h index 584efa67c8d..5c020bd0c4b 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h +++ b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h @@ -28,316 +28,316 @@ typedef Cubit_ptr CubitRef; class Cubit_var { public: - Cubit_var(); - Cubit_var(Cubit_ptr); - Cubit_var(const Cubit_var&); - ~Cubit_var(); - Cubit_var& operator=(Cubit_ptr); - operator Cubit_ptr() const { return _ptr; } + Cubit_var(); + Cubit_var(Cubit_ptr); + Cubit_var(const Cubit_var&); + ~Cubit_var(); + Cubit_var& operator=(Cubit_ptr); + operator Cubit_ptr() const { return _ptr; } #if defined(_HPCC_BUG) - operator Cubit *&() { return _ptr; } + operator Cubit *&() { return _ptr; } #else - operator Cubit_ptr&() { return _ptr; } + operator Cubit_ptr&() { return _ptr; } #endif - Cubit_ptr operator->() const { return _ptr;} - friend NCistream& operator>>(NCistream&, Cubit_var&); - friend NCostream& operator<<(NCostream&, const Cubit_var&); - friend istream& operator>>(istream&, Cubit_var&); - friend ostream& operator<<(ostream&, const Cubit_var&); + Cubit_ptr operator->() const { return _ptr;} + friend NCistream& operator>>(NCistream&, Cubit_var&); + friend NCostream& operator<<(NCostream&, const Cubit_var&); + friend istream& operator>>(istream&, Cubit_var&); + friend ostream& operator<<(ostream&, const Cubit_var&); private: - Cubit_ptr _ptr; - void operator=(const Cubit_var&) {} + Cubit_ptr _ptr; + void operator=(const Cubit_var&) {} }; #endif class Cubit: public virtual CORBA_Object { private: - static const CORBA::TypeInfo _class_info; - Cubit(const Cubit&) {} - void operator=(const Cubit&){} + static const CORBA::TypeInfo _class_info; + Cubit(const Cubit&) {} + void operator=(const Cubit&){} public: - static const CORBA::TypeInfo *_desc(); - virtual const CORBA::TypeInfo *_type_info() const; - virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; - static CORBA::Object *_factory(); + static const CORBA::TypeInfo *_desc(); + virtual const CORBA::TypeInfo *_type_info() const; + virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; + static CORBA::Object *_factory(); protected: - Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} - Cubit(NCistream& strm) :CORBA_Object(strm) {} - virtual ~Cubit() {} + Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} + Cubit(NCistream& strm) :CORBA_Object(strm) {} + virtual ~Cubit() {} public: - static Cubit_ptr _duplicate(Cubit_ptr obj) { - if (obj ) obj->_ref(); - return obj; - } - static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} - static Cubit_ptr _narrow(CORBA::Object *obj); - static Cubit_ptr _clone(Cubit_ptr obj) { - CORBA::Object_var obj_var(__clone(obj)); + static Cubit_ptr _duplicate(Cubit_ptr obj) { + if (obj ) obj->_ref(); + return obj; + } + static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} + static Cubit_ptr _narrow(CORBA::Object *obj); + static Cubit_ptr _clone(Cubit_ptr obj) { + CORBA::Object_var obj_var(__clone(obj)); #if defined(_HPCC_BUG) - return _narrow(obj_var.operator CORBA::Object_ptr()); + return _narrow(obj_var.operator CORBA::Object_ptr()); #else - return _narrow(obj_var); + return _narrow(obj_var); #endif - } - static Cubit_ptr _bind(const char *object_name = NULL, - const char *host_name = NULL, - const CORBA::BindOptions* opt = NULL); - - virtual CORBA::Octet cube_octet(CORBA::Octet o); - - virtual CORBA::Short cube_short(CORBA::Short s); - - virtual CORBA::Long cube_long(CORBA::Long l); - - struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - }; - friend NCostream& operator<<(NCostream&, const Many& ); - friend NCistream& operator>>(NCistream&, Many& ); - - friend ostream& operator<<(ostream&, const Many& ); - inline friend istream& operator>>(istream& _strm, Many& _obj) { - NCistream _istrm(_strm); - _istrm >> _obj; - return _strm; - } - - - typedef Many *Many_ptr; - class Many_var - { - public: - Many_var() { _ptr = (Many*)NULL;} - Many_var(Many *ptr) { - _ptr = ptr; - } - Many_var(const Many_var& var) { - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - } - ~Many_var() { - if (_ptr != (Many *)NULL) delete _ptr; - } - Many_var& operator=(Many *ptr) { - if (_ptr != (Many *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - Many_var& operator=(const Many_var& var) { - if (_ptr != (Many *)NULL) delete _ptr; - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - return *this; - } - Many *operator->() { return _ptr; } - operator Many () const { return *_ptr; } - operator Many& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const Many_var& var) { - if (var._ptr == (Many *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - Many_var& var) { - if ( ! var._ptr) - var._ptr = new Many; - strm >> *var._ptr; - return strm; - } - private: - Many *_ptr; - }; - - - virtual Cubit::Many cube_struct(const Cubit::Many& values); - - enum discrim { - e_0th, - e_1st, - e_2nd, - e_3rd, - e_4th, - e_5th - }; - inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - if (_temp >= 6) - throw CORBA::BAD_PARAM(); - _enum_type = discrim(_temp); - return _strm; - } - inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { - if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { - _strm << "discrim:"; - switch(_enum_type) { - case e_0th: - _strm << "e_0th" << endl; - break; - case e_1st: - _strm << "e_1st" << endl; - break; - case e_2nd: - _strm << "e_2nd" << endl; - break; - case e_3rd: - _strm << "e_3rd" << endl; - break; - case e_4th: - _strm << "e_4th" << endl; - break; - case e_5th: - _strm << "e_5th" << endl; - break; - } - } - else - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - _enum_type = discrim(_temp); - return _strm; - } - - - class oneof - { - public: - private: - discrim _disc; - CORBA::Octet __o; - CORBA::Short __s; - CORBA::Long __l; - Cubit::Many __cm; - public: - oneof() : _disc(discrim(0)) {} - ~oneof() {} - oneof(const oneof& obj); - oneof& operator=(const oneof& obj); - - void _d(discrim val) { _disc = val; } - discrim _d() const { return _disc; } - - void o(CORBA::Octet val) { - __o = val; - _disc = Cubit::e_0th; - } - CORBA::Octet o() const { return __o; } - - void s(CORBA::Short val) { - __s = val; - _disc = Cubit::e_1st; - } - CORBA::Short s() const { return __s; } - - void l(CORBA::Long val) { - __l = val; - _disc = Cubit::e_2nd; - } - CORBA::Long l() const { return __l; } - - void cm(const Cubit::Many& val) { - __cm = val; - _disc = Cubit::e_3rd; - } - const Cubit::Many& cm() const { return __cm; } - Cubit::Many& cm() { return __cm; } - - friend NCostream& operator<<(NCostream&, const oneof& ); - friend NCistream& operator>>(NCistream&, oneof& ); - friend ostream& operator<<(ostream&, const oneof&); - inline friend istream& operator>>(istream& strm, oneof& obj) { - NCistream istrm(strm); - strm >> obj; - return strm; - } - }; - - typedef oneof *oneof_ptr; - class oneof_var - { - public: - oneof_var() { _ptr = (oneof*)NULL;} - oneof_var(oneof *ptr) { - _ptr = ptr; - } - oneof_var(const oneof_var& var) { - _ptr = new oneof(*var._ptr); - } - ~oneof_var() { - if (_ptr != (oneof *)NULL) delete _ptr; - } - oneof_var& operator=(oneof *ptr) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - oneof_var& operator=(const oneof_var& var) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = new oneof(*var._ptr); - return *this; - } - oneof *operator->() { return _ptr; } - operator oneof () const { return *_ptr; } - operator oneof& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const oneof_var& var) { - if (var._ptr == (oneof *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - oneof_var& var) { - if ( ! var._ptr) - var._ptr = new oneof; - strm >> *var._ptr; - return strm; - } - private: - oneof *_ptr; - }; - - - virtual Cubit::oneof cube_union(const Cubit::oneof& values); - - virtual void please_exit(); - - inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { - CORBA::Object_var _obj(obj); - _obj = CORBA::Object::_read(strm, Cubit::_desc()); - obj = Cubit::_narrow(_obj); - return strm; - } - inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { - strm << (CORBA::Object_ptr)obj; - return strm; - } - inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { - NCistream istrm(strm); - istrm >> obj; - return strm; - } + } + static Cubit_ptr _bind(const char *object_name = NULL, + const char *host_name = NULL, + const CORBA::BindOptions* opt = NULL); + + virtual CORBA::Octet cube_octet(CORBA::Octet o); + + virtual CORBA::Short cube_short(CORBA::Short s); + + virtual CORBA::Long cube_long(CORBA::Long l); + + struct Many { + CORBA::Octet o; + CORBA::Long l; + CORBA::Short s; + }; + friend NCostream& operator<<(NCostream&, const Many& ); + friend NCistream& operator>>(NCistream&, Many& ); + + friend ostream& operator<<(ostream&, const Many& ); + inline friend istream& operator>>(istream& _strm, Many& _obj) { + NCistream _istrm(_strm); + _istrm >> _obj; + return _strm; + } + + + typedef Many *Many_ptr; + class Many_var + { + public: + Many_var() { _ptr = (Many*)NULL;} + Many_var(Many *ptr) { + _ptr = ptr; + } + Many_var(const Many_var& var) { + if (var._ptr) + _ptr = new Many(*var._ptr); + else + _ptr = (Many *)NULL; + } + ~Many_var() { + if (_ptr != (Many *)NULL) delete _ptr; + } + Many_var& operator=(Many *ptr) { + if (_ptr != (Many *)NULL) delete _ptr; + _ptr = ptr; + return *this; + } + Many_var& operator=(const Many_var& var) { + if (_ptr != (Many *)NULL) delete _ptr; + if (var._ptr) + _ptr = new Many(*var._ptr); + else + _ptr = (Many *)NULL; + return *this; + } + Many *operator->() { return _ptr; } + operator Many () const { return *_ptr; } + operator Many& () { return *_ptr; } + inline friend NCostream& operator<<(NCostream& strm, + const Many_var& var) { + if (var._ptr == (Many *)NULL) { + throw CORBA::BAD_PARAM(); + } + else + strm << *var._ptr; + return strm; + } + inline friend NCistream& operator>>(NCistream& strm, + Many_var& var) { + if ( ! var._ptr) + var._ptr = new Many; + strm >> *var._ptr; + return strm; + } + private: + Many *_ptr; + }; + + + virtual Cubit::Many cube_struct(const Cubit::Many& values); + + enum discrim { + e_0th, + e_1st, + e_2nd, + e_3rd, + e_4th, + e_5th + }; + inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { + _strm << (CORBA::ULong)_enum_type; + return _strm; + } + inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { + CORBA::ULong _temp; + _strm >> _temp; + if (_temp >= 6) + throw CORBA::BAD_PARAM(); + _enum_type = discrim(_temp); + return _strm; + } + inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { + if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { + _strm << "discrim:"; + switch(_enum_type) { + case e_0th: + _strm << "e_0th" << endl; + break; + case e_1st: + _strm << "e_1st" << endl; + break; + case e_2nd: + _strm << "e_2nd" << endl; + break; + case e_3rd: + _strm << "e_3rd" << endl; + break; + case e_4th: + _strm << "e_4th" << endl; + break; + case e_5th: + _strm << "e_5th" << endl; + break; + } + } + else + _strm << (CORBA::ULong)_enum_type; + return _strm; + } + inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { + CORBA::ULong _temp; + _strm >> _temp; + _enum_type = discrim(_temp); + return _strm; + } + + + class oneof + { + public: + private: + discrim _disc; + CORBA::Octet __o; + CORBA::Short __s; + CORBA::Long __l; + Cubit::Many __cm; + public: + oneof() : _disc(discrim(0)) {} + ~oneof() {} + oneof(const oneof& obj); + oneof& operator=(const oneof& obj); + + void _d(discrim val) { _disc = val; } + discrim _d() const { return _disc; } + + void o(CORBA::Octet val) { + __o = val; + _disc = Cubit::e_0th; + } + CORBA::Octet o() const { return __o; } + + void s(CORBA::Short val) { + __s = val; + _disc = Cubit::e_1st; + } + CORBA::Short s() const { return __s; } + + void l(CORBA::Long val) { + __l = val; + _disc = Cubit::e_2nd; + } + CORBA::Long l() const { return __l; } + + void cm(const Cubit::Many& val) { + __cm = val; + _disc = Cubit::e_3rd; + } + const Cubit::Many& cm() const { return __cm; } + Cubit::Many& cm() { return __cm; } + + friend NCostream& operator<<(NCostream&, const oneof& ); + friend NCistream& operator>>(NCistream&, oneof& ); + friend ostream& operator<<(ostream&, const oneof&); + inline friend istream& operator>>(istream& strm, oneof& obj) { + NCistream istrm(strm); + strm >> obj; + return strm; + } + }; + + typedef oneof *oneof_ptr; + class oneof_var + { + public: + oneof_var() { _ptr = (oneof*)NULL;} + oneof_var(oneof *ptr) { + _ptr = ptr; + } + oneof_var(const oneof_var& var) { + _ptr = new oneof(*var._ptr); + } + ~oneof_var() { + if (_ptr != (oneof *)NULL) delete _ptr; + } + oneof_var& operator=(oneof *ptr) { + if (_ptr != (oneof *)NULL) delete _ptr; + _ptr = ptr; + return *this; + } + oneof_var& operator=(const oneof_var& var) { + if (_ptr != (oneof *)NULL) delete _ptr; + _ptr = new oneof(*var._ptr); + return *this; + } + oneof *operator->() { return _ptr; } + operator oneof () const { return *_ptr; } + operator oneof& () { return *_ptr; } + inline friend NCostream& operator<<(NCostream& strm, + const oneof_var& var) { + if (var._ptr == (oneof *)NULL) { + throw CORBA::BAD_PARAM(); + } + else + strm << *var._ptr; + return strm; + } + inline friend NCistream& operator>>(NCistream& strm, + oneof_var& var) { + if ( ! var._ptr) + var._ptr = new oneof; + strm >> *var._ptr; + return strm; + } + private: + oneof *_ptr; + }; + + + virtual Cubit::oneof cube_union(const Cubit::oneof& values); + + virtual void please_exit(); + + inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { + CORBA::Object_var _obj(obj); + _obj = CORBA::Object::_read(strm, Cubit::_desc()); + obj = Cubit::_narrow(_obj); + return strm; + } + inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { + strm << (CORBA::Object_ptr)obj; + return strm; + } + inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { + NCistream istrm(strm); + istrm >> obj; + return strm; + } }; diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h index 3ca717e2b49..7132e9d229c 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h +++ b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h @@ -20,100 +20,100 @@ class _sk_Cubit : public Cubit { protected: - _sk_Cubit(const char *object_name = (const char *)NULL); - _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); - virtual ~_sk_Cubit() {} + _sk_Cubit(const char *object_name = (const char *)NULL); + _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); + virtual ~_sk_Cubit() {} public: - static const CORBA::TypeInfo _skel_info; - - // The following operations need to be implemented by the server. - virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; - virtual CORBA::Short cube_short(CORBA::Short s) = 0; - virtual CORBA::Long cube_long(CORBA::Long l) = 0; - virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; - virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; - virtual void please_exit() = 0; - - // Skeleton Operations implemented automatically - - static void _cube_octet(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_short(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_long(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_struct(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_union(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _please_exit(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - + static const CORBA::TypeInfo _skel_info; + + // The following operations need to be implemented by the server. + virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; + virtual CORBA::Short cube_short(CORBA::Short s) = 0; + virtual CORBA::Long cube_long(CORBA::Long l) = 0; + virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; + virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; + virtual void please_exit() = 0; + + // Skeleton Operations implemented automatically + + static void _cube_octet(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_short(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_long(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_struct(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_union(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _please_exit(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + }; template <class T> class _tie_Cubit : public Cubit { public: - _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : - Cubit(obj_name), - _ref(t) { - _object_name(obj_name); - } - _tie_Cubit(T& t, const char *service_name, - const CORBA::ReferenceData& id) - :_ref(t) { - _service(service_name, id); - } - ~_tie_Cubit() {} - CORBA::Octet cube_octet(CORBA::Octet o) { - return _ref.cube_octet( - o); - } - CORBA::Short cube_short(CORBA::Short s) { - return _ref.cube_short( - s); - } - CORBA::Long cube_long(CORBA::Long l) { - return _ref.cube_long( - l); - } - Cubit::Many cube_struct(const Cubit::Many& values) { - return _ref.cube_struct( - values); - } - Cubit::oneof cube_union(const Cubit::oneof& values) { - return _ref.cube_union( - values); - } - void please_exit() { - _ref.please_exit(); - } + _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : + Cubit(obj_name), + _ref(t) { + _object_name(obj_name); + } + _tie_Cubit(T& t, const char *service_name, + const CORBA::ReferenceData& id) + :_ref(t) { + _service(service_name, id); + } + ~_tie_Cubit() {} + CORBA::Octet cube_octet(CORBA::Octet o) { + return _ref.cube_octet( + o); + } + CORBA::Short cube_short(CORBA::Short s) { + return _ref.cube_short( + s); + } + CORBA::Long cube_long(CORBA::Long l) { + return _ref.cube_long( + l); + } + Cubit::Many cube_struct(const Cubit::Many& values) { + return _ref.cube_struct( + values); + } + Cubit::oneof cube_union(const Cubit::oneof& values) { + return _ref.cube_union( + values); + } + void please_exit() { + _ref.please_exit(); + } private: - T& _ref; + T& _ref; }; #endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h index b5e8be94cf1..7912a2dc92c 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h +++ b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h @@ -2,11 +2,16 @@ #include "cubit.h" #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Thread_Manager.h" // // Create a thread filter to dispatch incoming calls // class tpr_filter : public CORBA::ThreadFilter { - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); + virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); }; diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h index 1fd0a2d3c7d..37fb9f317d4 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h +++ b/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h @@ -5,6 +5,11 @@ #define cubit_hh #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include <CORBA.h> @@ -13,7 +18,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -28,12 +33,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -92,12 +97,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -711,7 +716,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h index 3a2dd546608..80e2c0590f5 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h +++ b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h @@ -14,7 +14,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -29,12 +29,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -93,12 +93,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -586,7 +586,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -602,76 +602,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -682,19 +682,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -712,7 +712,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; @@ -732,7 +732,7 @@ public: class Cubit_Factory_dispatch : public virtual CORBA::PPTR { public: - Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -747,12 +747,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -811,12 +811,12 @@ protected: } public: static Cubit_Factory_ptr _duplicate( - Cubit_Factory_ptr, + Cubit_Factory_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit_Factory* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit_Factory* _bind (CORBA::Environment &IT_env); static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -1014,7 +1014,7 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem } operator Cubit_Factory_ptr () const { - return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); + return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); } Cubit_Factory_ptr operator->() const { return *_ptr;} @@ -1030,36 +1030,36 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem #define TIE_Cubit_Factory(X) Cubit_Factory##X #define DEF_TIE_Cubit_Factory(X) \ - class Cubit_Factory##X : public virtual Cubit_Factory { \ - X* m_obj; \ - public: \ - \ - \ - Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit_Factory(), m_obj(objp) { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ - } \ - Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit_Factory() { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit_Factory##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit_Factory##X : public virtual Cubit_Factory { \ + X* m_obj; \ + public: \ + \ + \ + Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit_Factory(), m_obj(objp) { \ + m_pptr = new Cubit_Factory_dispatch \ + (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ + } \ + Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit_Factory() { \ + m_pptr = new Cubit_Factory_dispatch \ + (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit_Factory##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->create_cubit ( name,IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit_Factory \ +#define QUALS_Cubit_Factory \ virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->create_cubit ( name,IT_env);\ }\ @@ -1070,19 +1070,19 @@ return m_obj->create_cubit ( name,IT_env);\ class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -1100,7 +1100,7 @@ public: Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR)) m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this, - (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); + (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); } virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h index 1fd0a2d3c7d..37fb9f317d4 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h +++ b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h @@ -5,6 +5,11 @@ #define cubit_hh #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include <CORBA.h> @@ -13,7 +18,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -28,12 +33,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -92,12 +97,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -711,7 +716,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h index 337a7f54e65..536aeedad22 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h +++ b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h @@ -2,6 +2,11 @@ #include "cubit.h" #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Thread_Manager.h" #include "ace/Task.h" diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h index 1fd0a2d3c7d..37fb9f317d4 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h +++ b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h @@ -5,6 +5,11 @@ #define cubit_hh #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include <CORBA.h> @@ -13,7 +18,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -28,12 +33,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -92,12 +97,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -585,7 +590,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -601,76 +606,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -681,19 +686,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -711,7 +716,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h index 584efa67c8d..5c020bd0c4b 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h +++ b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h @@ -28,316 +28,316 @@ typedef Cubit_ptr CubitRef; class Cubit_var { public: - Cubit_var(); - Cubit_var(Cubit_ptr); - Cubit_var(const Cubit_var&); - ~Cubit_var(); - Cubit_var& operator=(Cubit_ptr); - operator Cubit_ptr() const { return _ptr; } + Cubit_var(); + Cubit_var(Cubit_ptr); + Cubit_var(const Cubit_var&); + ~Cubit_var(); + Cubit_var& operator=(Cubit_ptr); + operator Cubit_ptr() const { return _ptr; } #if defined(_HPCC_BUG) - operator Cubit *&() { return _ptr; } + operator Cubit *&() { return _ptr; } #else - operator Cubit_ptr&() { return _ptr; } + operator Cubit_ptr&() { return _ptr; } #endif - Cubit_ptr operator->() const { return _ptr;} - friend NCistream& operator>>(NCistream&, Cubit_var&); - friend NCostream& operator<<(NCostream&, const Cubit_var&); - friend istream& operator>>(istream&, Cubit_var&); - friend ostream& operator<<(ostream&, const Cubit_var&); + Cubit_ptr operator->() const { return _ptr;} + friend NCistream& operator>>(NCistream&, Cubit_var&); + friend NCostream& operator<<(NCostream&, const Cubit_var&); + friend istream& operator>>(istream&, Cubit_var&); + friend ostream& operator<<(ostream&, const Cubit_var&); private: - Cubit_ptr _ptr; - void operator=(const Cubit_var&) {} + Cubit_ptr _ptr; + void operator=(const Cubit_var&) {} }; #endif class Cubit: public virtual CORBA_Object { private: - static const CORBA::TypeInfo _class_info; - Cubit(const Cubit&) {} - void operator=(const Cubit&){} + static const CORBA::TypeInfo _class_info; + Cubit(const Cubit&) {} + void operator=(const Cubit&){} public: - static const CORBA::TypeInfo *_desc(); - virtual const CORBA::TypeInfo *_type_info() const; - virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; - static CORBA::Object *_factory(); + static const CORBA::TypeInfo *_desc(); + virtual const CORBA::TypeInfo *_type_info() const; + virtual void *_safe_narrow(const CORBA::TypeInfo& ) const; + static CORBA::Object *_factory(); protected: - Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} - Cubit(NCistream& strm) :CORBA_Object(strm) {} - virtual ~Cubit() {} + Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {} + Cubit(NCistream& strm) :CORBA_Object(strm) {} + virtual ~Cubit() {} public: - static Cubit_ptr _duplicate(Cubit_ptr obj) { - if (obj ) obj->_ref(); - return obj; - } - static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} - static Cubit_ptr _narrow(CORBA::Object *obj); - static Cubit_ptr _clone(Cubit_ptr obj) { - CORBA::Object_var obj_var(__clone(obj)); + static Cubit_ptr _duplicate(Cubit_ptr obj) { + if (obj ) obj->_ref(); + return obj; + } + static Cubit_ptr _nil() { return (Cubit_ptr)NULL;} + static Cubit_ptr _narrow(CORBA::Object *obj); + static Cubit_ptr _clone(Cubit_ptr obj) { + CORBA::Object_var obj_var(__clone(obj)); #if defined(_HPCC_BUG) - return _narrow(obj_var.operator CORBA::Object_ptr()); + return _narrow(obj_var.operator CORBA::Object_ptr()); #else - return _narrow(obj_var); + return _narrow(obj_var); #endif - } - static Cubit_ptr _bind(const char *object_name = NULL, - const char *host_name = NULL, - const CORBA::BindOptions* opt = NULL); - - virtual CORBA::Octet cube_octet(CORBA::Octet o); - - virtual CORBA::Short cube_short(CORBA::Short s); - - virtual CORBA::Long cube_long(CORBA::Long l); - - struct Many { - CORBA::Octet o; - CORBA::Long l; - CORBA::Short s; - }; - friend NCostream& operator<<(NCostream&, const Many& ); - friend NCistream& operator>>(NCistream&, Many& ); - - friend ostream& operator<<(ostream&, const Many& ); - inline friend istream& operator>>(istream& _strm, Many& _obj) { - NCistream _istrm(_strm); - _istrm >> _obj; - return _strm; - } - - - typedef Many *Many_ptr; - class Many_var - { - public: - Many_var() { _ptr = (Many*)NULL;} - Many_var(Many *ptr) { - _ptr = ptr; - } - Many_var(const Many_var& var) { - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - } - ~Many_var() { - if (_ptr != (Many *)NULL) delete _ptr; - } - Many_var& operator=(Many *ptr) { - if (_ptr != (Many *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - Many_var& operator=(const Many_var& var) { - if (_ptr != (Many *)NULL) delete _ptr; - if (var._ptr) - _ptr = new Many(*var._ptr); - else - _ptr = (Many *)NULL; - return *this; - } - Many *operator->() { return _ptr; } - operator Many () const { return *_ptr; } - operator Many& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const Many_var& var) { - if (var._ptr == (Many *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - Many_var& var) { - if ( ! var._ptr) - var._ptr = new Many; - strm >> *var._ptr; - return strm; - } - private: - Many *_ptr; - }; - - - virtual Cubit::Many cube_struct(const Cubit::Many& values); - - enum discrim { - e_0th, - e_1st, - e_2nd, - e_3rd, - e_4th, - e_5th - }; - inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - if (_temp >= 6) - throw CORBA::BAD_PARAM(); - _enum_type = discrim(_temp); - return _strm; - } - inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { - if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { - _strm << "discrim:"; - switch(_enum_type) { - case e_0th: - _strm << "e_0th" << endl; - break; - case e_1st: - _strm << "e_1st" << endl; - break; - case e_2nd: - _strm << "e_2nd" << endl; - break; - case e_3rd: - _strm << "e_3rd" << endl; - break; - case e_4th: - _strm << "e_4th" << endl; - break; - case e_5th: - _strm << "e_5th" << endl; - break; - } - } - else - _strm << (CORBA::ULong)_enum_type; - return _strm; - } - inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { - CORBA::ULong _temp; - _strm >> _temp; - _enum_type = discrim(_temp); - return _strm; - } - - - class oneof - { - public: - private: - discrim _disc; - CORBA::Octet __o; - CORBA::Short __s; - CORBA::Long __l; - Cubit::Many __cm; - public: - oneof() : _disc(discrim(0)) {} - ~oneof() {} - oneof(const oneof& obj); - oneof& operator=(const oneof& obj); - - void _d(discrim val) { _disc = val; } - discrim _d() const { return _disc; } - - void o(CORBA::Octet val) { - __o = val; - _disc = Cubit::e_0th; - } - CORBA::Octet o() const { return __o; } - - void s(CORBA::Short val) { - __s = val; - _disc = Cubit::e_1st; - } - CORBA::Short s() const { return __s; } - - void l(CORBA::Long val) { - __l = val; - _disc = Cubit::e_2nd; - } - CORBA::Long l() const { return __l; } - - void cm(const Cubit::Many& val) { - __cm = val; - _disc = Cubit::e_3rd; - } - const Cubit::Many& cm() const { return __cm; } - Cubit::Many& cm() { return __cm; } - - friend NCostream& operator<<(NCostream&, const oneof& ); - friend NCistream& operator>>(NCistream&, oneof& ); - friend ostream& operator<<(ostream&, const oneof&); - inline friend istream& operator>>(istream& strm, oneof& obj) { - NCistream istrm(strm); - strm >> obj; - return strm; - } - }; - - typedef oneof *oneof_ptr; - class oneof_var - { - public: - oneof_var() { _ptr = (oneof*)NULL;} - oneof_var(oneof *ptr) { - _ptr = ptr; - } - oneof_var(const oneof_var& var) { - _ptr = new oneof(*var._ptr); - } - ~oneof_var() { - if (_ptr != (oneof *)NULL) delete _ptr; - } - oneof_var& operator=(oneof *ptr) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = ptr; - return *this; - } - oneof_var& operator=(const oneof_var& var) { - if (_ptr != (oneof *)NULL) delete _ptr; - _ptr = new oneof(*var._ptr); - return *this; - } - oneof *operator->() { return _ptr; } - operator oneof () const { return *_ptr; } - operator oneof& () { return *_ptr; } - inline friend NCostream& operator<<(NCostream& strm, - const oneof_var& var) { - if (var._ptr == (oneof *)NULL) { - throw CORBA::BAD_PARAM(); - } - else - strm << *var._ptr; - return strm; - } - inline friend NCistream& operator>>(NCistream& strm, - oneof_var& var) { - if ( ! var._ptr) - var._ptr = new oneof; - strm >> *var._ptr; - return strm; - } - private: - oneof *_ptr; - }; - - - virtual Cubit::oneof cube_union(const Cubit::oneof& values); - - virtual void please_exit(); - - inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { - CORBA::Object_var _obj(obj); - _obj = CORBA::Object::_read(strm, Cubit::_desc()); - obj = Cubit::_narrow(_obj); - return strm; - } - inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { - strm << (CORBA::Object_ptr)obj; - return strm; - } - inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { - NCistream istrm(strm); - istrm >> obj; - return strm; - } + } + static Cubit_ptr _bind(const char *object_name = NULL, + const char *host_name = NULL, + const CORBA::BindOptions* opt = NULL); + + virtual CORBA::Octet cube_octet(CORBA::Octet o); + + virtual CORBA::Short cube_short(CORBA::Short s); + + virtual CORBA::Long cube_long(CORBA::Long l); + + struct Many { + CORBA::Octet o; + CORBA::Long l; + CORBA::Short s; + }; + friend NCostream& operator<<(NCostream&, const Many& ); + friend NCistream& operator>>(NCistream&, Many& ); + + friend ostream& operator<<(ostream&, const Many& ); + inline friend istream& operator>>(istream& _strm, Many& _obj) { + NCistream _istrm(_strm); + _istrm >> _obj; + return _strm; + } + + + typedef Many *Many_ptr; + class Many_var + { + public: + Many_var() { _ptr = (Many*)NULL;} + Many_var(Many *ptr) { + _ptr = ptr; + } + Many_var(const Many_var& var) { + if (var._ptr) + _ptr = new Many(*var._ptr); + else + _ptr = (Many *)NULL; + } + ~Many_var() { + if (_ptr != (Many *)NULL) delete _ptr; + } + Many_var& operator=(Many *ptr) { + if (_ptr != (Many *)NULL) delete _ptr; + _ptr = ptr; + return *this; + } + Many_var& operator=(const Many_var& var) { + if (_ptr != (Many *)NULL) delete _ptr; + if (var._ptr) + _ptr = new Many(*var._ptr); + else + _ptr = (Many *)NULL; + return *this; + } + Many *operator->() { return _ptr; } + operator Many () const { return *_ptr; } + operator Many& () { return *_ptr; } + inline friend NCostream& operator<<(NCostream& strm, + const Many_var& var) { + if (var._ptr == (Many *)NULL) { + throw CORBA::BAD_PARAM(); + } + else + strm << *var._ptr; + return strm; + } + inline friend NCistream& operator>>(NCistream& strm, + Many_var& var) { + if ( ! var._ptr) + var._ptr = new Many; + strm >> *var._ptr; + return strm; + } + private: + Many *_ptr; + }; + + + virtual Cubit::Many cube_struct(const Cubit::Many& values); + + enum discrim { + e_0th, + e_1st, + e_2nd, + e_3rd, + e_4th, + e_5th + }; + inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) { + _strm << (CORBA::ULong)_enum_type; + return _strm; + } + inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) { + CORBA::ULong _temp; + _strm >> _temp; + if (_temp >= 6) + throw CORBA::BAD_PARAM(); + _enum_type = discrim(_temp); + return _strm; + } + inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) { + if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) { + _strm << "discrim:"; + switch(_enum_type) { + case e_0th: + _strm << "e_0th" << endl; + break; + case e_1st: + _strm << "e_1st" << endl; + break; + case e_2nd: + _strm << "e_2nd" << endl; + break; + case e_3rd: + _strm << "e_3rd" << endl; + break; + case e_4th: + _strm << "e_4th" << endl; + break; + case e_5th: + _strm << "e_5th" << endl; + break; + } + } + else + _strm << (CORBA::ULong)_enum_type; + return _strm; + } + inline friend istream& operator>>(istream& _strm, discrim& _enum_type) { + CORBA::ULong _temp; + _strm >> _temp; + _enum_type = discrim(_temp); + return _strm; + } + + + class oneof + { + public: + private: + discrim _disc; + CORBA::Octet __o; + CORBA::Short __s; + CORBA::Long __l; + Cubit::Many __cm; + public: + oneof() : _disc(discrim(0)) {} + ~oneof() {} + oneof(const oneof& obj); + oneof& operator=(const oneof& obj); + + void _d(discrim val) { _disc = val; } + discrim _d() const { return _disc; } + + void o(CORBA::Octet val) { + __o = val; + _disc = Cubit::e_0th; + } + CORBA::Octet o() const { return __o; } + + void s(CORBA::Short val) { + __s = val; + _disc = Cubit::e_1st; + } + CORBA::Short s() const { return __s; } + + void l(CORBA::Long val) { + __l = val; + _disc = Cubit::e_2nd; + } + CORBA::Long l() const { return __l; } + + void cm(const Cubit::Many& val) { + __cm = val; + _disc = Cubit::e_3rd; + } + const Cubit::Many& cm() const { return __cm; } + Cubit::Many& cm() { return __cm; } + + friend NCostream& operator<<(NCostream&, const oneof& ); + friend NCistream& operator>>(NCistream&, oneof& ); + friend ostream& operator<<(ostream&, const oneof&); + inline friend istream& operator>>(istream& strm, oneof& obj) { + NCistream istrm(strm); + strm >> obj; + return strm; + } + }; + + typedef oneof *oneof_ptr; + class oneof_var + { + public: + oneof_var() { _ptr = (oneof*)NULL;} + oneof_var(oneof *ptr) { + _ptr = ptr; + } + oneof_var(const oneof_var& var) { + _ptr = new oneof(*var._ptr); + } + ~oneof_var() { + if (_ptr != (oneof *)NULL) delete _ptr; + } + oneof_var& operator=(oneof *ptr) { + if (_ptr != (oneof *)NULL) delete _ptr; + _ptr = ptr; + return *this; + } + oneof_var& operator=(const oneof_var& var) { + if (_ptr != (oneof *)NULL) delete _ptr; + _ptr = new oneof(*var._ptr); + return *this; + } + oneof *operator->() { return _ptr; } + operator oneof () const { return *_ptr; } + operator oneof& () { return *_ptr; } + inline friend NCostream& operator<<(NCostream& strm, + const oneof_var& var) { + if (var._ptr == (oneof *)NULL) { + throw CORBA::BAD_PARAM(); + } + else + strm << *var._ptr; + return strm; + } + inline friend NCistream& operator>>(NCistream& strm, + oneof_var& var) { + if ( ! var._ptr) + var._ptr = new oneof; + strm >> *var._ptr; + return strm; + } + private: + oneof *_ptr; + }; + + + virtual Cubit::oneof cube_union(const Cubit::oneof& values); + + virtual void please_exit(); + + inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) { + CORBA::Object_var _obj(obj); + _obj = CORBA::Object::_read(strm, Cubit::_desc()); + obj = Cubit::_narrow(_obj); + return strm; + } + inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) { + strm << (CORBA::Object_ptr)obj; + return strm; + } + inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) { + NCistream istrm(strm); + istrm >> obj; + return strm; + } }; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h index 3ca717e2b49..7132e9d229c 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h +++ b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h @@ -20,100 +20,100 @@ class _sk_Cubit : public Cubit { protected: - _sk_Cubit(const char *object_name = (const char *)NULL); - _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); - virtual ~_sk_Cubit() {} + _sk_Cubit(const char *object_name = (const char *)NULL); + _sk_Cubit(const char *service_name, const CORBA::ReferenceData& data); + virtual ~_sk_Cubit() {} public: - static const CORBA::TypeInfo _skel_info; - - // The following operations need to be implemented by the server. - virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; - virtual CORBA::Short cube_short(CORBA::Short s) = 0; - virtual CORBA::Long cube_long(CORBA::Long l) = 0; - virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; - virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; - virtual void please_exit() = 0; - - // Skeleton Operations implemented automatically - - static void _cube_octet(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_short(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_long(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_struct(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _cube_union(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - - static void _please_exit(void *obj, - CORBA::MarshalStream &strm, - CORBA::Principal_ptr principal, - const char *oper, - void *priv_data); - + static const CORBA::TypeInfo _skel_info; + + // The following operations need to be implemented by the server. + virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0; + virtual CORBA::Short cube_short(CORBA::Short s) = 0; + virtual CORBA::Long cube_long(CORBA::Long l) = 0; + virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0; + virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0; + virtual void please_exit() = 0; + + // Skeleton Operations implemented automatically + + static void _cube_octet(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_short(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_long(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_struct(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _cube_union(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + + static void _please_exit(void *obj, + CORBA::MarshalStream &strm, + CORBA::Principal_ptr principal, + const char *oper, + void *priv_data); + }; template <class T> class _tie_Cubit : public Cubit { public: - _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : - Cubit(obj_name), - _ref(t) { - _object_name(obj_name); - } - _tie_Cubit(T& t, const char *service_name, - const CORBA::ReferenceData& id) - :_ref(t) { - _service(service_name, id); - } - ~_tie_Cubit() {} - CORBA::Octet cube_octet(CORBA::Octet o) { - return _ref.cube_octet( - o); - } - CORBA::Short cube_short(CORBA::Short s) { - return _ref.cube_short( - s); - } - CORBA::Long cube_long(CORBA::Long l) { - return _ref.cube_long( - l); - } - Cubit::Many cube_struct(const Cubit::Many& values) { - return _ref.cube_struct( - values); - } - Cubit::oneof cube_union(const Cubit::oneof& values) { - return _ref.cube_union( - values); - } - void please_exit() { - _ref.please_exit(); - } + _tie_Cubit(T& t, const char *obj_name=(char*)NULL) : + Cubit(obj_name), + _ref(t) { + _object_name(obj_name); + } + _tie_Cubit(T& t, const char *service_name, + const CORBA::ReferenceData& id) + :_ref(t) { + _service(service_name, id); + } + ~_tie_Cubit() {} + CORBA::Octet cube_octet(CORBA::Octet o) { + return _ref.cube_octet( + o); + } + CORBA::Short cube_short(CORBA::Short s) { + return _ref.cube_short( + s); + } + CORBA::Long cube_long(CORBA::Long l) { + return _ref.cube_long( + l); + } + Cubit::Many cube_struct(const Cubit::Many& values) { + return _ref.cube_struct( + values); + } + Cubit::oneof cube_union(const Cubit::oneof& values) { + return _ref.cube_union( + values); + } + void please_exit() { + _ref.please_exit(); + } private: - T& _ref; + T& _ref; }; #endif diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h index b5e8be94cf1..7912a2dc92c 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h +++ b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h @@ -2,11 +2,16 @@ #include "cubit.h" #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Thread_Manager.h" // // Create a thread filter to dispatch incoming calls // class tpr_filter : public CORBA::ThreadFilter { - virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); + virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&); }; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h index 3a2dd546608..80e2c0590f5 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h +++ b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h @@ -14,7 +14,7 @@ class Cubit_dispatch : public virtual CORBA::PPTR { public: - Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -29,12 +29,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -93,12 +93,12 @@ protected: } public: static Cubit_ptr _duplicate( - Cubit_ptr, + Cubit_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit* _bind (CORBA::Environment &IT_env); static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -586,7 +586,7 @@ class Cubit_SeqElem : public CORBA::_SeqElem } operator Cubit_ptr () const { - return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); + return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); } Cubit_ptr operator->() const { return *_ptr;} @@ -602,76 +602,76 @@ class Cubit_SeqElem : public CORBA::_SeqElem #define TIE_Cubit(X) Cubit##X #define DEF_TIE_Cubit(X) \ - class Cubit##X : public virtual Cubit { \ - X* m_obj; \ - public: \ - \ - \ - Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit(), m_obj(objp) { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ - } \ - Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit() { \ - m_pptr = new Cubit_dispatch \ - (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit##X : public virtual Cubit { \ + X* m_obj; \ + public: \ + \ + \ + Cubit##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit(), m_obj(objp) { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj); \ + } \ + Cubit##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit() { \ + m_pptr = new Cubit_dispatch \ + (( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit \ +#define QUALS_Cubit \ virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_octet ( o,IT_env);\ }\ - \ + \ virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_short ( s,IT_env);\ }\ - \ + \ virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_long ( l,IT_env);\ }\ - \ + \ virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_struct ( values,IT_env);\ }\ - \ + \ virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->cube_union ( values,IT_env);\ }\ - \ + \ virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\ m_obj->please_exit (IT_env);\ }\ @@ -682,19 +682,19 @@ m_obj->please_exit (IT_env);\ class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: CubitProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -712,7 +712,7 @@ public: CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_IR)) m_pptr = new Cubit_dispatch ( (Cubit*)this, - (CORBA::Object*)this, m, l, Cubit_IR, this); + (CORBA::Object*)this, m, l, Cubit_IR, this); } virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; @@ -732,7 +732,7 @@ public: class Cubit_Factory_dispatch : public virtual CORBA::PPTR { public: - Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, + Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {} @@ -747,12 +747,12 @@ public: : PPTR (IT_OR,IT_p,IT_o) {} - Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, + Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, char *IT_i, CORBA::Object* IT_ob, void* IT_im) : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {} - virtual unsigned char dispatch (CORBA::Request &IT_r, + virtual unsigned char dispatch (CORBA::Request &IT_r, unsigned char IT_isTarget, void* IT_pp=NULL); @@ -811,12 +811,12 @@ protected: } public: static Cubit_Factory_ptr _duplicate( - Cubit_Factory_ptr, + Cubit_Factory_ptr, CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()); public: static Cubit_Factory* _bind (const char* IT_markerServer, const char* host, - const CORBA::Context &IT_c, - CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); + const CORBA::Context &IT_c, + CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); static Cubit_Factory* _bind (CORBA::Environment &IT_env); static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -1014,7 +1014,7 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem } operator Cubit_Factory_ptr () const { - return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); + return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); } Cubit_Factory_ptr operator->() const { return *_ptr;} @@ -1030,36 +1030,36 @@ class Cubit_Factory_SeqElem : public CORBA::_SeqElem #define TIE_Cubit_Factory(X) Cubit_Factory##X #define DEF_TIE_Cubit_Factory(X) \ - class Cubit_Factory##X : public virtual Cubit_Factory { \ - X* m_obj; \ - public: \ - \ - \ - Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ - : Cubit_Factory(), m_obj(objp) { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ - } \ - Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ - : Cubit_Factory() { \ - m_pptr = new Cubit_Factory_dispatch \ - (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ - m_obj = (X*)(m_pptr->getImplObj ()); \ - } \ - \ - virtual ~Cubit_Factory##X () { \ - if (_okToDeleteImpl ()) delete m_obj; } \ - virtual void* _deref () { \ - return m_obj; } \ - \ + class Cubit_Factory##X : public virtual Cubit_Factory { \ + X* m_obj; \ + public: \ + \ + \ + Cubit_Factory##X (X *objp, const char* m="", CORBA::LoaderClass *l=0)\ + : Cubit_Factory(), m_obj(objp) { \ + m_pptr = new Cubit_Factory_dispatch \ + (( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj); \ + } \ + Cubit_Factory##X (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\ + : Cubit_Factory() { \ + m_pptr = new Cubit_Factory_dispatch \ + (( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q); \ + m_obj = (X*)(m_pptr->getImplObj ()); \ + } \ + \ + virtual ~Cubit_Factory##X () { \ + if (_okToDeleteImpl ()) delete m_obj; } \ + virtual void* _deref () { \ + return m_obj; } \ + \ virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->create_cubit ( name,IT_env);\ }\ - \ - }; \ + \ + }; \ -#define QUALS_Cubit_Factory \ +#define QUALS_Cubit_Factory \ virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\ return m_obj->create_cubit ( name,IT_env);\ }\ @@ -1070,19 +1070,19 @@ return m_obj->create_cubit ( name,IT_env);\ class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass { public: Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0) - : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {} + : CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {} virtual void* New (char *IT_OR, CORBA::Environment&); virtual void* New (ObjectReference *IT_OR, CORBA::Environment&); - virtual void* New2 (); + virtual void* New2 (); virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&); virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&); - virtual CORBA::Object* New2Object (); + virtual CORBA::Object* New2Object (); virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()); @@ -1100,7 +1100,7 @@ public: Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) { if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR)) m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this, - (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); + (CORBA::Object*)this, m, l, Cubit_Factory_IR, this); } virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0; diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h index 0fea9857af3..13e65492916 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h +++ b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h @@ -7,6 +7,10 @@ #include "cubit.h" #include "ace/Task.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #ifdef Cubit_USE_BOA class Cubit_Impl : public virtual CubitBOAImpl { #else diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h b/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h index 362c9ed4e91..169b44dfd62 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h +++ b/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h @@ -3,6 +3,11 @@ #include "cubit.h" #include "cubit_impl.h" #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Thread_Manager.h" #include "ace/Task.h" diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.h b/TAO/IIOP/tests/Cubit/TAO/cubit.h index 78d6b604052..12d99b4e403 100644 --- a/TAO/IIOP/tests/Cubit/TAO/cubit.h +++ b/TAO/IIOP/tests/Cubit/TAO/cubit.h @@ -1,6 +1,6 @@ // $Id$ -// @(#)cubit.hh 1.1 95/09/10 +// @(#)cubit.hh 1.1 95/09/10 // Copyright 1994-1995 by Sun Microsystems Inc. // All Rights Reserved // @@ -15,12 +15,12 @@ // mean lots of narrowing/widening/RTTI infrastructure. // -#ifndef _CUBIT_HH -#define _CUBIT_HH +#ifndef _CUBIT_HH +#define _CUBIT_HH -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (push, 1) // VC++, known padding rules +#endif // VC++ #include <corba/orb.h> #include <corba/stub.h> @@ -30,16 +30,16 @@ // C style binding // -typedef CORBA_Object Cubit; +typedef CORBA_Object Cubit; typedef Cubit *Cubit_ptr, *CubitRef; -extern CORBA_TypeCode_ptr TC_Cubit_Many; -extern CORBA_TypeCode_ptr TC_Cubit_oneof; +extern CORBA_TypeCode_ptr TC_Cubit_Many; +extern CORBA_TypeCode_ptr TC_Cubit_oneof; struct Cubit_Many { - CORBA_Octet o; - CORBA_Long l; - CORBA_Short s; + CORBA_Octet o; + CORBA_Long l; + CORBA_Short s; }; enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2, @@ -48,61 +48,61 @@ enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2, struct Cubit_oneof { Cubit_discrim _disc; - union { - CORBA_Octet o; - CORBA_Short s; - CORBA_Long l; + union { + CORBA_Octet o; + CORBA_Short s; + CORBA_Long l; Cubit_Many cm; }; }; CORBA_Octet Cubit_cube_octet ( - Cubit_ptr target, - CORBA_Octet o, - CORBA_Environment &env + Cubit_ptr target, + CORBA_Octet o, + CORBA_Environment &env ); CORBA_Short Cubit_cube_short ( - Cubit_ptr target, - CORBA_Short s, - CORBA_Environment &env + Cubit_ptr target, + CORBA_Short s, + CORBA_Environment &env ); CORBA_Long Cubit_cube_long ( - Cubit_ptr target, - CORBA_Long l, - CORBA_Environment &env + Cubit_ptr target, + CORBA_Long l, + CORBA_Environment &env ); Cubit_Many * Cubit_cube_struct ( - Cubit_ptr target, - Cubit_Many &values, - CORBA_Environment &env + Cubit_ptr target, + Cubit_Many &values, + CORBA_Environment &env ); Cubit_oneof * Cubit_cube_union ( - Cubit_ptr target, + Cubit_ptr target, Cubit_oneof &values, - CORBA_Environment &env + CORBA_Environment &env ); void Cubit_please_exit ( - Cubit_ptr target, - CORBA_Environment &env + Cubit_ptr target, + CORBA_Environment &env ); -extern const CORBA_Char *Cubit__id; // type ID +extern const CORBA_Char *Cubit__id; // type ID extern const TAO_Skel_Entry Cubit_operations []; -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (pop) // VC++, go back to other padding rules +#endif // VC++ -#endif // _CUBIT_HH +#endif // _CUBIT_HH diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitC.h b/TAO/IIOP/tests/Cubit/TAO/cubitC.h index 98610b55116..e80a1378bdb 100644 --- a/TAO/IIOP/tests/Cubit/TAO/cubitC.h +++ b/TAO/IIOP/tests/Cubit/TAO/cubitC.h @@ -9,25 +9,25 @@ /************************************************************************** This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation +implementation ***************************************************************************/ -#ifndef _CUBIT_HH -#define _CUBIT_HH +#ifndef _CUBIT_HH +#define _CUBIT_HH -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (push, 1) // VC++, known padding rules +#endif // VC++ #include "corba/orb.h" #include "corba/stub.h" #include <iostream.h> -extern CORBA_TypeCode_ptr TC_Cubit_Many; -extern CORBA_TypeCode_ptr TC_Cubit_oneof; +extern CORBA_TypeCode_ptr TC_Cubit_Many; +extern CORBA_TypeCode_ptr TC_Cubit_oneof; -struct Cubit_Many +struct Cubit_Many { CORBA_Octet o; CORBA_Long l; @@ -38,12 +38,12 @@ enum Cubit_discrim { e_0th = 0, e_1st = 1, e_2nd = 2, e_3rd = 3, e_4th = 4, e_5th = 5 }; -struct Cubit_oneof +struct Cubit_oneof { Cubit_discrim _disc; - - union - { + + union + { CORBA_Octet o; CORBA_Short s; CORBA_Long l; @@ -58,32 +58,32 @@ typedef Cubit_ptr Cubit_ref; class Cubit : public virtual CORBA_Object { public: - + static Cubit_ptr _duplicate(Cubit_ptr obj); static Cubit_ptr _narrow(CORBA_Object_ptr obj); static Cubit_ptr _nil(); - virtual + virtual CORBA_Octet Cubit_cube_octet (CORBA_Octet o, CORBA_Environment &env); - virtual + virtual CORBA_Short Cubit_cube_short (CORBA_Short s, CORBA_Environment &env); - - virtual + + virtual CORBA_Long Cubit_cube_long (CORBA_Long l, CORBA_Environment &env); - - virtual + + virtual Cubit_Many* Cubit_cube_struct (Cubit_Many &values, CORBA_Environment &env); - - virtual + + virtual Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, CORBA_Environment &env); - - virtual + + virtual void Cubit_please_exit (CORBA_Environment &env); protected: @@ -92,13 +92,13 @@ protected: : CORBA_Object(objref) { } virtual ~Cubit() { } - + }; -extern const CORBA_Char *Cubit__id; // type ID +extern const CORBA_Char *Cubit__id; // type ID -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (pop) // VC++, go back to other padding rules +#endif // VC++ -#endif // _CUBIT_HH +#endif // _CUBIT_HH diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitS.h b/TAO/IIOP/tests/Cubit/TAO/cubitS.h index a4b4b853901..a35eeba4714 100644 --- a/TAO/IIOP/tests/Cubit/TAO/cubitS.h +++ b/TAO/IIOP/tests/Cubit/TAO/cubitS.h @@ -9,11 +9,11 @@ /************************************************************************** This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation +implementation ***************************************************************************/ -#ifndef _SKEL_CUBIT_HH -#define _SKEL_CUBIT_HH +#ifndef _SKEL_CUBIT_HH +#define _SKEL_CUBIT_HH #include "cubitC.h" @@ -27,7 +27,7 @@ public: virtual CORBA_Octet Cubit_cube_octet (CORBA_Octet o, CORBA_Environment &env) = 0; - static + static void _cube_octet_skel(CORBA_ServerRequest &req, CORBA_Object_ptr obj, CORBA_Environment &env); @@ -35,7 +35,7 @@ public: virtual CORBA_Short Cubit_cube_short (CORBA_Short s, CORBA_Environment &env) = 0; - + static void _cube_short_skel (CORBA_ServerRequest &req, CORBA_Object_ptr obj, @@ -44,8 +44,8 @@ public: virtual CORBA_Long Cubit_cube_long (CORBA_Long l, CORBA_Environment &env) = 0; - - static + + static void _cube_long_skel (CORBA_ServerRequest &req, CORBA_Object_ptr obj, CORBA_Environment &env); @@ -53,25 +53,25 @@ public: virtual Cubit_Many* Cubit_cube_struct (Cubit_Many &values, CORBA_Environment &env) = 0; - - static + + static void _cube_struct_skel (CORBA_ServerRequest &req, CORBA_Object_ptr obj, CORBA_Environment &env); - virtual + virtual Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, CORBA_Environment &env) = 0; - - static + + static void _cube_union_skel (CORBA_ServerRequest &req, CORBA_Object_ptr obj, CORBA_Environment &env); - virtual + virtual void Cubit_please_exit (CORBA_Environment &env) = 0; - static + static void _please_exit_skel (CORBA_ServerRequest &req, CORBA_Object_ptr obj, CORBA_Environment &env); @@ -81,4 +81,4 @@ protected: }; -#endif // _SKEL_CUBIT_HH +#endif // _SKEL_CUBIT_HH diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit_i.h b/TAO/IIOP/tests/Cubit/TAO/cubit_i.h index 7ddf1947cd3..5ae7d565be1 100644 --- a/TAO/IIOP/tests/Cubit/TAO/cubit_i.h +++ b/TAO/IIOP/tests/Cubit/TAO/cubit_i.h @@ -4,18 +4,18 @@ // Copyright 1994-1995 by Sun Microsystems Inc. // All Rights Reserved // -// TEST: hand-written Cubit Implementation +// TEST: hand-written Cubit Implementation // // Modified version of Cubit Example written by Sun Microsystems Inc. // Modified by: Brian Mendel /************************************************************************** This file has been hand-crafted to work with the ORB API of the SUN's IIOP -implementation +implementation ***************************************************************************/ -#ifndef _CUBIT_I_HH -#define _CUBIT_I_HH +#ifndef _CUBIT_I_HH +#define _CUBIT_I_HH #include "cubitS.h" @@ -28,7 +28,7 @@ class Cubit_i : public _skel_Cubit public: Cubit_i(const char* obj_name = 0); ~Cubit_i(); - + virtual CORBA_Octet Cubit_cube_octet (CORBA_Octet o, CORBA_Environment &env); @@ -36,21 +36,21 @@ public: virtual CORBA_Short Cubit_cube_short (CORBA_Short s, CORBA_Environment &env); - + virtual CORBA_Long Cubit_cube_long (CORBA_Long l, CORBA_Environment &env); - + virtual Cubit_Many* Cubit_cube_struct (Cubit_Many &values, CORBA_Environment &env); - + virtual Cubit_oneof* Cubit_cube_union (Cubit_oneof &values, CORBA_Environment &env); - + virtual void Cubit_please_exit (CORBA_Environment &env); }; -#endif // _CUBIT_I_HH +#endif // _CUBIT_I_HH diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.h b/TAO/IIOP/tests/Cubit/TAO/test1.h index 63e409d36c3..513bffc82d7 100644 --- a/TAO/IIOP/tests/Cubit/TAO/test1.h +++ b/TAO/IIOP/tests/Cubit/TAO/test1.h @@ -1,41 +1,41 @@ // $Id$ -// @(#)test1.hh 1.2 95/09/12 +// @(#)test1.hh 1.2 95/09/12 // Copyright 1995 by Sun Microsystems, Inc. // All Rights Reserved // -// TEST interface for "test1" +// TEST interface for "test1" // -#ifndef _TEST1_HH -#define _TEST1_HH +#ifndef _TEST1_HH +#define _TEST1_HH #include <corba/orb.h> #include <corba/stub.h> -#ifdef _MSC_VER -#pragma pack (push, 1) // VC++, known padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (push, 1) // VC++, known padding rules +#endif // VC++ -typedef CORBA_UShort test1_ushort; -typedef CORBA_ULong test1_ulong; +typedef CORBA_UShort test1_ushort; +typedef CORBA_ULong test1_ulong; -typedef CORBA_LongLong test1_longlong; -typedef CORBA_ULongLong test1_ulonglong; -typedef CORBA_LongDouble test1_longdouble; +typedef CORBA_LongLong test1_longlong; +typedef CORBA_ULongLong test1_ulonglong; +typedef CORBA_LongDouble test1_longdouble; -typedef CORBA_Object test1; -typedef test1 *test1_ptr; +typedef CORBA_Object test1; +typedef test1 *test1_ptr; -#define DECL_TEST(typename, truetype) \ +#define DECL_TEST(typename, truetype) \ truetype \ test1_test_ ## typename ( \ - test1_ptr target, \ - truetype in_a1, \ - truetype &out_a2, \ - truetype &inout_a3, \ - CORBA_Environment &env \ + test1_ptr target, \ + truetype in_a1, \ + truetype &out_a2, \ + truetype &inout_a3, \ + CORBA_Environment &env \ ) void test_illegal (test1_ptr target, CORBA_Environment &env); @@ -53,11 +53,11 @@ DECL_TEST (octet, CORBA_Octet); CORBA_Any * test1_test_any ( - test1_ptr target, - const CORBA_Any &in_a1, - CORBA_Any *&out_a2, - CORBA_Any &inout_a3, - CORBA_Environment &env + test1_ptr target, + const CORBA_Any &in_a1, + CORBA_Any *&out_a2, + CORBA_Any &inout_a3, + CORBA_Environment &env ); DECL_TEST (TypeCode, CORBA_TypeCode_ptr); @@ -76,51 +76,51 @@ DECL_TEST (wstring, CORBA_WString); DECL_TEST (longdouble, CORBA_LongDouble); -#undef DECL_TEST +#undef DECL_TEST -extern CORBA_TypeCode_ptr _tc_test1_x1; +extern CORBA_TypeCode_ptr _tc_test1_x1; class test1_x1 : public CORBA_UserException { public: - CORBA_Long case_num; - - test1_x1 (CORBA_Long n) - : CORBA_UserException (_tc_test1_x1), case_num (n) - { } + CORBA_Long case_num; + + test1_x1 (CORBA_Long n) + : CORBA_UserException (_tc_test1_x1), case_num (n) + { } }; -extern CORBA_TypeCode_ptr _tc_test1_x2; +extern CORBA_TypeCode_ptr _tc_test1_x2; class test1_x2 : public CORBA_UserException { public: - CORBA_Object_ptr obj; - CORBA_Long case_num; + CORBA_Object_ptr obj; + CORBA_Long case_num; - test1_x2 (CORBA_Object_ptr obj1, - CORBA_Long n) - : CORBA_UserException (_tc_test1_x2), - obj (obj1), case_num (n) { } + test1_x2 (CORBA_Object_ptr obj1, + CORBA_Long n) + : CORBA_UserException (_tc_test1_x2), + obj (obj1), case_num (n) { } - ~test1_x2 () - { CORBA_release (obj); } + ~test1_x2 () + { CORBA_release (obj); } }; void test1_test_throw ( - test1_ptr target, - CORBA_Long case_num, - CORBA_Environment &env // throw (x1, x2) + test1_ptr target, + CORBA_Long case_num, + CORBA_Environment &env // throw (x1, x2) ); void test1_please_exit ( - test1_ptr target, - CORBA_Environment &env + test1_ptr target, + CORBA_Environment &env ); -#ifdef _MSC_VER -#pragma pack (pop) // VC++, go back to other padding rules -#endif // VC++ +#ifdef _MSC_VER +#pragma pack (pop) // VC++, go back to other padding rules +#endif // VC++ -#endif // _TEST1_HH +#endif // _TEST1_HH diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h index 4198fba9a10..8a4f73314ce 100644 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h +++ b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h @@ -3,7 +3,7 @@ /* An interval timer class using C++. */ -#if !defined (ACE_PROFILE_TIMER_H) +#ifndef ACE_PROFILE_TIMER_H #define ACE_PROFILE_TIMER_H #include <sys/types.h> @@ -38,21 +38,21 @@ private: prusage_t begin_usage_; prusage_t end_usage_; prusage_t last_usage_; - int proc_fd_; + int proc_fd_; }; /* Start timing */ -inline int -Profile_Timer::start (void) +inline int +Profile_Timer::start (void) { return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_); } /* Stop timing */ -inline int -Profile_Timer::stop (void) +inline int +Profile_Timer::stop (void) { this->last_usage_ = this->end_usage_; return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_); diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h index 4198fba9a10..8a4f73314ce 100644 --- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h +++ b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h @@ -3,7 +3,7 @@ /* An interval timer class using C++. */ -#if !defined (ACE_PROFILE_TIMER_H) +#ifndef ACE_PROFILE_TIMER_H #define ACE_PROFILE_TIMER_H #include <sys/types.h> @@ -38,21 +38,21 @@ private: prusage_t begin_usage_; prusage_t end_usage_; prusage_t last_usage_; - int proc_fd_; + int proc_fd_; }; /* Start timing */ -inline int -Profile_Timer::start (void) +inline int +Profile_Timer::start (void) { return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_); } /* Stop timing */ -inline int -Profile_Timer::stop (void) +inline int +Profile_Timer::stop (void) { this->last_usage_ = this->end_usage_; return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_); diff --git a/TAO/IIOP/tests/Thruput_test/ttcpC.h b/TAO/IIOP/tests/Thruput_test/ttcpC.h index b23be499c73..12767a52bfc 100644 --- a/TAO/IIOP/tests/Thruput_test/ttcpC.h +++ b/TAO/IIOP/tests/Thruput_test/ttcpC.h @@ -56,10 +56,10 @@ public: ShortSeq(); ShortSeq(CORBA_ULong max); ShortSeq(CORBA_ULong max, - CORBA_ULong length, - CORBA_Short *value, - CORBA_Boolean release = 0 - ); + CORBA_ULong length, + CORBA_Short *value, + CORBA_Boolean release = 0 + ); // ShortSeq(const ShortSeq&); ~ShortSeq(); CORBA_ULong maximum() const; @@ -81,10 +81,10 @@ public: LongSeq(); LongSeq(CORBA_ULong max); LongSeq(CORBA_ULong max, - CORBA_ULong length, - CORBA_Long *value, - CORBA_Boolean release = 0 - ); + CORBA_ULong length, + CORBA_Long *value, + CORBA_Boolean release = 0 + ); // LongSeq(const LongSeq&); ~LongSeq(); CORBA_ULong maximum() const; @@ -106,10 +106,10 @@ public: DoubleSeq(); DoubleSeq(CORBA_ULong max); DoubleSeq(CORBA_ULong max, - CORBA_ULong length, - CORBA_Double *value, - CORBA_Boolean release = 0 - ); + CORBA_ULong length, + CORBA_Double *value, + CORBA_Boolean release = 0 + ); // DoubleSeq(const DoubleSeq&); ~DoubleSeq(); CORBA_ULong maximum() const; @@ -131,10 +131,10 @@ public: CharSeq(); CharSeq(CORBA_ULong max); CharSeq(CORBA_ULong max, - CORBA_ULong length, - CORBA_Char *value, - CORBA_Boolean release = 0 - ); + CORBA_ULong length, + CORBA_Char *value, + CORBA_Boolean release = 0 + ); // CharSeq(const CharSeq&); ~CharSeq(); CORBA_ULong maximum() const; @@ -156,10 +156,10 @@ public: OctetSeq(); OctetSeq(CORBA_ULong max); OctetSeq(CORBA_ULong max, - CORBA_ULong length, - CORBA_Octet *value, - CORBA_Boolean release = 0 - ); + CORBA_ULong length, + CORBA_Octet *value, + CORBA_Boolean release = 0 + ); // OctetSeq(const OctetSeq&); ~OctetSeq(); CORBA_ULong maximum() const; @@ -181,10 +181,10 @@ public: StructSeq(); StructSeq(CORBA_ULong max); StructSeq(CORBA_ULong max, - CORBA_ULong length, - PerfStruct *value, - CORBA_Boolean release = 0 - ); + CORBA_ULong length, + PerfStruct *value, + CORBA_Boolean release = 0 + ); // StructSeq(const StructSeq&); ~StructSeq(); CORBA_ULong maximum() const; diff --git a/TAO/IIOP/tests/Thruput_test/ttcpS.h b/TAO/IIOP/tests/Thruput_test/ttcpS.h index 14ff95379e3..0b0ba100da0 100644 --- a/TAO/IIOP/tests/Thruput_test/ttcpS.h +++ b/TAO/IIOP/tests/Thruput_test/ttcpS.h @@ -31,33 +31,33 @@ public: virtual void stop_timer(CORBA_Environment &) = 0; // skeletons that do the upcall - static void _ttcp_sequence_is_a_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); + static void _ttcp_sequence_is_a_skel (CORBA_ServerRequest &req, + CORBA_Object_ptr obj, + CORBA_Environment &env); static void _ttcp_sequence_sendShortSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); + CORBA_Object_ptr obj, + CORBA_Environment &env); static void _ttcp_sequence_sendLongSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); + CORBA_Object_ptr obj, + CORBA_Environment &env); static void _ttcp_sequence_sendDoubleSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); + CORBA_Object_ptr obj, + CORBA_Environment &env); static void _ttcp_sequence_sendOctetSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); + CORBA_Object_ptr obj, + CORBA_Environment &env); static void _ttcp_sequence_sendCharSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); + CORBA_Object_ptr obj, + CORBA_Environment &env); static void _ttcp_sequence_sendStructSeq_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); + CORBA_Object_ptr obj, + CORBA_Environment &env); static void _ttcp_sequence_start_timer_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); + CORBA_Object_ptr obj, + CORBA_Environment &env); static void _ttcp_sequence_stop_timer_skel (CORBA_ServerRequest &req, - CORBA_Object_ptr obj, - CORBA_Environment &env); + CORBA_Object_ptr obj, + CORBA_Environment &env); protected: _skel_ttcp_sequence(const char *obj_name = 0); virtual ~_skel_ttcp_sequence() {} diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_i.h b/TAO/IIOP/tests/Thruput_test/ttcp_i.h index 71d2266e334..758b616e4cd 100644 --- a/TAO/IIOP/tests/Thruput_test/ttcp_i.h +++ b/TAO/IIOP/tests/Thruput_test/ttcp_i.h @@ -3,11 +3,11 @@ // ttcp_i.h -// +// // This header file provides facility to use it either as a BOA approach or as // a TIE approach. // -#if !defined (TTCP_I_H) +#ifndef TTCP_I_H #define TTCP_I_H #include "ttcp_decl.h" @@ -22,23 +22,23 @@ #define SEND_STRUCT ((unsigned long)(6)) -class ttcp_sequence_i: public _skel_ttcp_sequence +class ttcp_sequence_i: public _skel_ttcp_sequence { public: ttcp_sequence_i(const char *obj_name = 0); - virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, - CORBA_Environment &IT_env); - virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, - CORBA_Environment &IT_env); - virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, - CORBA_Environment &IT_env); - virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, - CORBA_Environment &IT_env); - virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, - CORBA_Environment &IT_env); - virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, - CORBA_Environment &IT_env); + virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, + CORBA_Environment &IT_env); + virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, + CORBA_Environment &IT_env); + virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, + CORBA_Environment &IT_env); + virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, + CORBA_Environment &IT_env); + virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, + CORBA_Environment &IT_env); + virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, + CORBA_Environment &IT_env); /* Routines to calculate the time required to transfer */ virtual void start_timer (CORBA_Environment &IT_env); |