diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-22 16:42:26 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-22 16:42:26 +0000 |
| commit | 428220e373b5846f8d98fba21a9fc38cae3e2c08 (patch) | |
| tree | ced47f14345d07b9795d41a5972d73a2664a65f9 | |
| parent | d889cae5e851b1b6d8b2a4b9312bc2a5d5431245 (diff) | |
| download | ATCD-428220e373b5846f8d98fba21a9fc38cae3e2c08.tar.gz | |
ChangeLogTag:Sat Feb 22 08:40:11 2003 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tests/OBV/Factory/FactoryC_impl.cpp | 18 | ||||
| -rw-r--r-- | TAO/tests/OBV/Factory/FactoryC_impl.h | 4 |
3 files changed, 17 insertions, 11 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 86554eb1ef9..bf75de07fb0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Sat Feb 22 08:40:11 2003 Ossama Othman <ossama@uci.edu> + + * tests/OBV/Factory/FactoryC_impl.h: + + "CORBA_" -> "CORBA::". + Fri Feb 21 13:40:41 2003 Ossama Othman <ossama@uci.edu> * tao/IOPC.cpp: diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp index 22601c8537c..c0091003338 100644 --- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp +++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp @@ -4,12 +4,12 @@ ACE_RCSID(Factory, FactoryC_impl, "$Id$") -OBV_FactoryTest::Value2* +OBV_FactoryTest::Value2* Value2_init_impl::create_default (CORBA::ULong id) { OBV_FactoryTest::Value2* ret_val = 0; - ACE_NEW_RETURN (ret_val, - Value2_impl, + ACE_NEW_RETURN (ret_val, + Value2_impl, 0); if (ret_val) @@ -20,14 +20,14 @@ Value2_init_impl::create_default (CORBA::ULong id) return ret_val; } -OBV_FactoryTest::Value2* +OBV_FactoryTest::Value2* Value2_init_impl::create ( CORBA::ULong id, const OBV_FactoryTest::BaseValue::BV_Data & data) { OBV_FactoryTest::Value2* ret_val = 0; - ACE_NEW_RETURN (ret_val, - Value2_impl, + ACE_NEW_RETURN (ret_val, + Value2_impl, 0); if (ret_val) @@ -39,12 +39,12 @@ Value2_init_impl::create ( return ret_val; } -CORBA_ValueBase* +CORBA::ValueBase * Value2_init_impl::create_for_unmarshal (void) { OBV_FactoryTest::Value2* ret_val = 0; - ACE_NEW_RETURN (ret_val, - Value2_impl, + ACE_NEW_RETURN (ret_val, + Value2_impl, 0); return ret_val; diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h index 61423429da9..2f1791745d8 100644 --- a/TAO/tests/OBV/Factory/FactoryC_impl.h +++ b/TAO/tests/OBV/Factory/FactoryC_impl.h @@ -20,7 +20,7 @@ // Just need to mix-in RefCounter class Value2_impl : public virtual OBV_OBV_FactoryTest::Value2, - public virtual CORBA_DefaultValueRefCountBase + public virtual CORBA::DefaultValueRefCountBase { // = TITLE // Value2 implementation @@ -53,7 +53,7 @@ public: public: - virtual CORBA_ValueBase* create_for_unmarshal (void); + virtual CORBA::ValueBase * create_for_unmarshal (void); }; |