summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2018-05-15 17:01:11 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2018-05-15 17:01:11 +0200
commit774e7f6ef1630fc42d3bf45d45e37fbaeb101659 (patch)
tree6f604536435e60753cf32b35229b66e49802008a
parent330d868ab419f28e24dfe1b9d29500eafac66b7e (diff)
downloadATCD-774e7f6ef1630fc42d3bf45d45e37fbaeb101659.tar.gz
Make use of std::unique_ptr when we have C++11
* TAO/tao/IORManipulation/IORManipulation.cpp:
-rw-r--r--TAO/tao/IORManipulation/IORManipulation.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 4a26a9d94d3..3c865e539f4 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -283,8 +283,13 @@ TAO_IOR_Manipulation_impl::is_in_ior (
CORBA::ULong count = 0;
TAO_Profile *pfile1 = 0;
TAO_Profile *pfile2 = 0;
+#if defined (ACE_HAS_CPP11)
+ std::unique_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ());
+ std::unique_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ());
+#else
auto_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ());
auto_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ());
+#endif /* ACE_HAS_CPP11 */
tmp_pfiles1->rewind ();
while ((pfile1 = tmp_pfiles1->get_next ()) != 0)