summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-07-09 21:41:44 +0000
committersbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-07-09 21:41:44 +0000
commit7c303c7ee2ca399fb6d05377b7f18ceced370f26 (patch)
treef768e949023f23487db87b6ef2cbaf57638e36e8
parent97186e5b9835abdca969c085df9edeb90b23f15a (diff)
downloadATCD-7c303c7ee2ca399fb6d05377b7f18ceced370f26.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-98c2
-rw-r--r--TAO/tao/deep_free.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 3f25f8ead8d..5067af217b8 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,5 +1,7 @@
Thu Jul 9 15:12:35 1998 Seth Benjamin Widoff <sbw1@waltz.cs.wustl.edu>
+ * tao/deep_free.cpp: wasn't freeing string fields of structs.
+
* tests/Quoter/Makefile: removed STL vestige.
Wed Jul 8 21:08:53 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
index c7eea80359b..a3613efb015 100644
--- a/TAO/tao/deep_free.cpp
+++ b/TAO/tao/deep_free.cpp
@@ -219,7 +219,7 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc,
retval = TAO_Marshal_Union::deep_free (param, source, dest, env);
break;
case CORBA::tk_string:
- //retval = TAO_Marshal_String::deep_free (param, &source, dest, env);
+ retval = TAO_Marshal_String::deep_free (param, source, dest, env);
break;
case CORBA::tk_sequence:
retval = TAO_Marshal_Sequence::deep_free (param, source, dest, env);
@@ -234,7 +234,7 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc,
retval = TAO_Marshal_Except::deep_free (param, source, dest, env);
break;
case CORBA::tk_wstring:
- retval = TAO_Marshal_WString::deep_free (param, &source, dest, env);
+ retval = TAO_Marshal_WString::deep_free (param, source, dest, env);
break;
default:
retval = CORBA::TypeCode::TRAVERSE_STOP;