summaryrefslogtreecommitdiff
path: root/TAO/tests/ORT
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-05-17 13:42:03 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-05-17 13:42:03 +0000
commit9c5ededb46e910392b60f66ad52feee13030687b (patch)
tree1597696f10b6f24049db12b71264c5c07e61d772 /TAO/tests/ORT
parent84316c4a5916ab2610aaab0ad9cc8e2cbe0af5e8 (diff)
downloadATCD-9c5ededb46e910392b60f66ad52feee13030687b.tar.gz
Fri May 17 13:40:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> Fix for Buzilla 1391
Diffstat (limited to 'TAO/tests/ORT')
-rw-r--r--TAO/tests/ORT/ObjectReferenceFactory.cpp13
-rw-r--r--TAO/tests/ORT/ObjectReferenceFactory.h9
2 files changed, 14 insertions, 8 deletions
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp
index cee5cdf81fa..846a745b131 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.cpp
+++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp
@@ -3,7 +3,6 @@
#include "ObjectReferenceFactory.h"
#include "tao/debug.h"
-
ObjectReferenceFactory::ObjectReferenceFactory (
PortableInterceptor::ObjectReferenceFactory * old_orf)
: old_orf_ (old_orf)
@@ -12,6 +11,18 @@ ObjectReferenceFactory::ObjectReferenceFactory (
CORBA::add_ref (old_orf);
}
+::CORBA::ValueBase *
+ObjectReferenceFactory::_copy_value (void)
+{
+ ::CORBA::ValueBase *ret_val= 0;
+ ACE_NEW_THROW_EX (
+ ret_val,
+ ObjectReferenceFactory (old_orf_.inout ()),
+ ::CORBA::NO_MEMORY ()
+ );
+ return ret_val;
+}
+
ObjectReferenceFactory::~ObjectReferenceFactory (void)
{
// No need to call CORBA::remove_ref() on this->old_orf_. It is a
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.h b/TAO/tests/ORT/ObjectReferenceFactory.h
index 354a7b38a0f..afa4449f7b5 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.h
+++ b/TAO/tests/ORT/ObjectReferenceFactory.h
@@ -10,7 +10,6 @@
*/
//=============================================================================
-
#ifndef TAO_OBJECT_REFERENCE_FACTORY_H
#define TAO_OBJECT_REFERENCE_FACTORY_H
@@ -25,7 +24,6 @@
#pragma warning(disable:4250)
#endif /* _MSC_VER */
-
/**
* @class ObjectReferenceFactory
*
@@ -41,11 +39,12 @@ class ObjectReferenceFactory
, public virtual CORBA::DefaultValueRefCountBase
{
public:
-
/// Constructor
ObjectReferenceFactory (
PortableInterceptor::ObjectReferenceFactory * old_orf);
+ virtual ::CORBA::ValueBase *_copy_value (void);
+
/**
* @name PortableInterceptor::ObjectReferenceFactory Methods
*
@@ -59,7 +58,6 @@ class ObjectReferenceFactory
//@}
protected:
-
/// Destructor
/**
* Protected destructor to enforce proper memory management via
@@ -68,7 +66,6 @@ protected:
~ObjectReferenceFactory (void);
private:
-
/// The old ObjectReferenceFactory used to create object references.
/**
* This ObjectReferenceFactory will still be used when creating
@@ -76,10 +73,8 @@ private:
* ObjectReferenceFactory.
*/
PortableInterceptor::ObjectReferenceFactory_var old_orf_;
-
};
-
#if defined (_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */