summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-06-04 21:08:27 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-06-04 21:08:27 +0000
commitaf13a2191ffa8392022e44520e521307fe555cc3 (patch)
treea74bda1bfa2807bf260488435a5f09ded87d8337
parent0a4eab93454dea0888ea3d2f150f565fbcd0eb13 (diff)
downloadATCD-af13a2191ffa8392022e44520e521307fe555cc3.tar.gz
ChangeLogTag: Tue Jun 4 16:00:46 2002 Jeff Parsons <parsons@cs.wustl.edu>
-rw-r--r--TAO/tao/CORBA_String.h5
-rw-r--r--TAO/tao/CORBA_String.inl6
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h
index 2b384b952b6..a5592805ffc 100644
--- a/TAO/tao/CORBA_String.h
+++ b/TAO/tao/CORBA_String.h
@@ -21,6 +21,7 @@
#include "ace/pre.h"
#include "tao/corbafwd.h"
+#include "tao/Managed_Types.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -32,7 +33,6 @@
#include "ace/streams.h"
#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
/**
* @class CORBA_String_var
*
@@ -117,6 +117,9 @@ public:
/// Construction from a var.
CORBA_String_out (CORBA_String_var &p);
+ /// Construction from a var.
+ CORBA_String_out (TAO_String_Manager &p);
+
/// Copy constructor.
CORBA_String_out (const CORBA_String_out &s);
diff --git a/TAO/tao/CORBA_String.inl b/TAO/tao/CORBA_String.inl
index f76d5b17438..ee4fb81204d 100644
--- a/TAO/tao/CORBA_String.inl
+++ b/TAO/tao/CORBA_String.inl
@@ -90,6 +90,12 @@ CORBA_String_out::CORBA_String_out (CORBA_String_var &s)
}
ACE_INLINE
+CORBA_String_out::CORBA_String_out (TAO_String_Manager &s)
+ : ptr_ (s.out ())
+{
+}
+
+ACE_INLINE
CORBA_String_out::CORBA_String_out (const CORBA_String_out &s)
: ptr_ (s.ptr_)
{