diff options
author | Steve Huston <shuston@riverace.com> | 2001-06-22 21:16:13 +0000 |
---|---|---|
committer | Steve Huston <shuston@riverace.com> | 2001-06-22 21:16:13 +0000 |
commit | a453da739d8a55ec5ede62a4ace639eefa53d1c6 (patch) | |
tree | e5c097a11c0a9792df8514a990e2590fef992ced | |
parent | f23afa009f8a0fbbd71902c1e07fb3cda0ba1d40 (diff) | |
download | ATCD-a453da739d8a55ec5ede62a4ace639eefa53d1c6.tar.gz |
ChangeLogTag:Fri Jun 22 10:31:29 2001 Steve Huston <shuston@riverace.com>
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
-rw-r--r-- | ace/Configuration.cpp | 20 | ||||
-rw-r--r-- | ace/Configuration.h | 16 |
5 files changed, 57 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index a0de7fc7a39..69c538e63fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ Fri Jun 22 13:10:13 2001 Krishnakumar B <kitty@cs.wustl.edu> Reverted the change as it seems to break VC++. Will fix it shortly. +Fri Jun 22 10:31:29 2001 Steve Huston <shuston@riverace.com> + + * ace/Configuration.{h cpp}: Added back the ACE_Configuration:: + import_config and export_config functions and marked them + deprecated. They're needed for backwards compatibility with + ACE 5.1. + Fri Jun 22 07:33:45 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/OS_TLI.{h,inl}: Changed the signature of the t_open() and diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index a0de7fc7a39..69c538e63fa 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -5,6 +5,13 @@ Fri Jun 22 13:10:13 2001 Krishnakumar B <kitty@cs.wustl.edu> Reverted the change as it seems to break VC++. Will fix it shortly. +Fri Jun 22 10:31:29 2001 Steve Huston <shuston@riverace.com> + + * ace/Configuration.{h cpp}: Added back the ACE_Configuration:: + import_config and export_config functions and marked them + deprecated. They're needed for backwards compatibility with + ACE 5.1. + Fri Jun 22 07:33:45 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/OS_TLI.{h,inl}: Changed the signature of the t_open() and diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index a0de7fc7a39..69c538e63fa 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -5,6 +5,13 @@ Fri Jun 22 13:10:13 2001 Krishnakumar B <kitty@cs.wustl.edu> Reverted the change as it seems to break VC++. Will fix it shortly. +Fri Jun 22 10:31:29 2001 Steve Huston <shuston@riverace.com> + + * ace/Configuration.{h cpp}: Added back the ACE_Configuration:: + import_config and export_config functions and marked them + deprecated. They're needed for backwards compatibility with + ACE 5.1. + Fri Jun 22 07:33:45 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/OS_TLI.{h,inl}: Changed the signature of the t_open() and diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index 010da55a523..39f3e68d18a 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -2,6 +2,10 @@ #include "ace/Configuration.h" #include "ace/Auto_Ptr.h" +// Can remove this when import_config and export_config are removed from +// ACE_Configuration. They're deprecated at ACE 5.2. +#include "ace/Configuration_Import_Export.h" + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) #if defined (ACE_HAS_THREADS) @@ -191,6 +195,22 @@ ACE_Configuration::expand_path (const ACE_Configuration_Section_Key& key, } +// import_config and export_config are here for backward compatibility, +// and have been deprecated. +int +ACE_Configuration::export_config (const ACE_TCHAR* filename) +{ + ACE_Ini_ImpExp exporter (*this); + return exporter.export_config (filename); +} + +int +ACE_Configuration::import_config (const ACE_TCHAR* filename) +{ + ACE_Ini_ImpExp importer (*this); + return importer.import_config (filename); +} + int ACE_Configuration::validate_name (const ACE_TCHAR* name) { diff --git a/ace/Configuration.h b/ace/Configuration.h index 4ccf8ea03b9..62593cd4d63 100644 --- a/ace/Configuration.h +++ b/ace/Configuration.h @@ -251,6 +251,22 @@ public: int create = 1); /** + * Exports the configuration database to filename. If <filename> is + * already present, it is overwritten. This function is deprecated and + * will be removed in a future version of ACE. Please use either + * ACE_Registry_ImpExp or ACE_Ini_ImpExp instead. + */ + int export_config (const ACE_TCHAR* filename); + + /** + * Imports the configuration database from filename. Any existing + * data is not removed. This function is deprecated and will be + * removed in a future version of ACE. Please use ACE_Registry_ImpExp + * or ACE_Ini_ImpExp instead. + */ + int import_config (const ACE_TCHAR* filename); + + /** * Determine if the contents of this object is the same as the * contents of the object on the right hand side. * Returns 1 (True) if they are equal and 0 (False) if they are not equal |