diff options
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/include/Ice/Initialize.h | 1 | ||||
-rw-r--r-- | cpp/include/Ice/Properties.h | 48 | ||||
-rw-r--r-- | cpp/include/Ice/ValueFactory.h | 32 | ||||
-rw-r--r-- | cpp/slice/Ice/Properties.ice | 25 | ||||
-rw-r--r-- | cpp/slice/Ice/ValueFactory.ice | 24 |
5 files changed, 49 insertions, 81 deletions
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 251b7c2a2dd..1784ba87383 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -19,7 +19,6 @@ ICE_API Communicator_ptr initializeWithProperties(int&, char*[], const Properties_ptr&); ICE_API Properties_ptr createProperties(); -ICE_API Properties_ptr copyProperties(const Properties_ptr&); ICE_API Properties_ptr loadProperties(const std::string&); } diff --git a/cpp/include/Ice/Properties.h b/cpp/include/Ice/Properties.h deleted file mode 100644 index df2b7cfe377..00000000000 --- a/cpp/include/Ice/Properties.h +++ /dev/null @@ -1,48 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_PROPERTIES_H -#define ICE_PROPERTIES_H - -#include <Ice/PropertiesF.h> -#include <Ice/CommunicatorF.h> -#include <Ice/Shared.h> -#include <map> - -namespace Ice -{ - -class ICE_API Properties : public ::__Ice::Shared -{ -public: - - std::string getProperty(const std::string&); - void setProperty(const std::string&, const std::string&); - -private: - - Properties(); - Properties(const std::string&); - Properties(const Properties_ptr&); - - friend ICE_API Communicator_ptr initialize(int&, char*[]); - friend ICE_API Properties_ptr createProperties(); - friend ICE_API Properties_ptr copyProperties(const Properties_ptr&); - friend ICE_API Properties_ptr loadProperties(const std::string&); - - void load(const std::string&); - void parse(std::istream&); - - std::map<std::string, std::string> properties_; -}; - -} - -#endif diff --git a/cpp/include/Ice/ValueFactory.h b/cpp/include/Ice/ValueFactory.h deleted file mode 100644 index fb5645258b8..00000000000 --- a/cpp/include/Ice/ValueFactory.h +++ /dev/null @@ -1,32 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_VALUE_FACTORY_H -#define ICE_VALUE_FACTORY_H - -#include <Ice/ValueFactoryF.h> -#include <Ice/ObjectF.h> -#include <Ice/Shared.h> - -namespace Ice -{ - -class ICE_API ValueFactory : public ::__Ice::Shared -{ -public: - - ValueFactory() { } - - virtual Ice::Object_ptr create(const std::string&) = 0; -}; - -} - -#endif diff --git a/cpp/slice/Ice/Properties.ice b/cpp/slice/Ice/Properties.ice new file mode 100644 index 00000000000..5275da23319 --- /dev/null +++ b/cpp/slice/Ice/Properties.ice @@ -0,0 +1,25 @@ +// ********************************************************************** +// +// Copyright (c) 2001 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#ifndef ICE_PROPERTIES_ICE +#define ICE_PROPERTIES_ICE + +module Ice +{ + +local class Properties +{ + string getProperty(string key); + void setProperty(string key, string value); +}; + +}; + +#endif diff --git a/cpp/slice/Ice/ValueFactory.ice b/cpp/slice/Ice/ValueFactory.ice new file mode 100644 index 00000000000..07394b3e90d --- /dev/null +++ b/cpp/slice/Ice/ValueFactory.ice @@ -0,0 +1,24 @@ +// ********************************************************************** +// +// Copyright (c) 2001 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#ifndef ICE_VALUE_FACTORY_ICE +#define ICE_VALUE_FACTORY_ICE + +module Ice +{ + +local class ValueFactory +{ + Object create(string id); +}; + +}; + +#endif |