aboutsummaryrefslogtreecommitdiff
path: root/dep/acelite/ace/Configuration.cpp
diff options
context:
space:
mode:
authorclick <none@none>2010-11-04 05:30:29 +0100
committerclick <none@none>2010-11-04 05:30:29 +0100
commit9b16ee203f3f8e6e21c4864bd3308bf58c7b6800 (patch)
tree14950af01860fc520bbbd320c7ad81ef0281cbf3 /dep/acelite/ace/Configuration.cpp
parent2604250c3c4efd93e9977f2eb72d6398a7a7bcb2 (diff)
Dep/ACE: Upgrade ACE -library to 5.8.3
--HG-- branch : trunk
Diffstat (limited to 'dep/acelite/ace/Configuration.cpp')
-rw-r--r--dep/acelite/ace/Configuration.cpp22
1 files changed, 1 insertions, 21 deletions
diff --git a/dep/acelite/ace/Configuration.cpp b/dep/acelite/ace/Configuration.cpp
index 1914f2dc651..4e0a1749e92 100644
--- a/dep/acelite/ace/Configuration.cpp
+++ b/dep/acelite/ace/Configuration.cpp
@@ -1,4 +1,4 @@
-// $Id: Configuration.cpp 86348 2009-08-04 14:45:29Z shuston $
+// $Id: Configuration.cpp 91688 2010-09-09 11:21:50Z johnnyw $
#include "ace/Configuration.h"
#include "ace/Auto_Ptr.h"
#include "ace/SString.h"
@@ -6,10 +6,6 @@
#include "ace/OS_NS_strings.h"
#include "ace/Tokenizer_T.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_LACKS_ACCESS)
# include "ace/OS_NS_unistd.h"
#endif /* ACE_LACKS_ACCESS */
@@ -135,22 +131,6 @@ 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_Registry_ImpExp exporter (*this);
- return exporter.export_config (filename);
-}
-
-int
-ACE_Configuration::import_config (const ACE_TCHAR* filename)
-{
- ACE_Registry_ImpExp importer (*this);
- return importer.import_config (filename);
-}
-
int
ACE_Configuration::validate_name (const ACE_TCHAR* name, int allow_path)
{