summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorturkaye <turkaye@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-05-30 20:24:59 +0000
committerturkaye <turkaye@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-05-30 20:24:59 +0000
commitb75d5b247dad8a5fe0f1669bc27980a9b8680c27 (patch)
tree257c89a85e14fe821d759dbd580a1dac313f71bf
parent648c21841eb825714db3a0b55c664c471da9cb3f (diff)
downloadATCD-b75d5b247dad8a5fe0f1669bc27980a9b8680c27.tar.gz
*** empty log message ***
-rw-r--r--TAO/CIAO/ChangeLog16
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.h2
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/XML_File_Intf.h2
3 files changed, 14 insertions, 6 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 235e37ad2f9..d01d70d41b0 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,8 +1,16 @@
+Mon May 30 15:22:16 2005 Emre Turkay <turkaye@dre.vanderbilt.edu>
+
+ * DAnCE/Config_Handlers/XML_File_Intf.h:
+ * DAnCE/Config_Handlers/DP_Handler.h:
+
+ auto_ptr is changed with ACE_Auto_Ptr, auto_ptr does not have
+ reset in VC6.
+
Mon May 30 17:59:28 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
* CIDLC/TypeNameEmitter.cpp:
-
- Fixed incorrect code generation in *_svnt.cpp file for
+
+ Fixed incorrect code generation in *_svnt.cpp file for
attribute assignment of sequence types. Thanks to Sunil Rottoo
<srottoo@adacelcanada.com> for reporting the problem.
@@ -39,8 +47,8 @@ Fri May 27 20:26:33 2005 Emre Turkay <turkaye@dre.vanderbilt.edu>
* CCF/Example/CIDL/LocalExecutorMapping/LocalExecutorMapping.vcproj:
* CCF/Example/CodeGenerationKit/Indentation/IDL/IDL.vcproj:
* CIDLC/CIDLC.vcproj:
-
- Deleted MSVC solution and project files, these are generated by the
+
+ Deleted MSVC solution and project files, these are generated by the
mwc.
Fri May 27 13:41:20 2005 Jaiganesh B <jai@dre.vanderbilt.edu>
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.h
index 08da1a611c2..3e26a71cbb7 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DP_Handler.h
@@ -58,7 +58,7 @@ namespace CIAO
private:
- auto_ptr< ::Deployment::DeploymentPlan> idl_dp_;
+ ACE_Auto_Ptr< ::Deployment::DeploymentPlan> idl_dp_;
DeploymentPlan &dp_;
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XML_File_Intf.h b/TAO/CIAO/DAnCE/Config_Handlers/XML_File_Intf.h
index b63400a1bb2..90a3d5c9033 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XML_File_Intf.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XML_File_Intf.h
@@ -43,7 +43,7 @@ namespace CIAO
bool read_process_file (const char *file);
private:
- auto_ptr< ::Deployment::DeploymentPlan> idl_dp_;
+ ACE_Auto_Ptr< ::Deployment::DeploymentPlan> idl_dp_;
};
}
}