diff options
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/Config.h | 6 | ||||
| -rw-r--r-- | cpp/include/Ice/Initialize.h | 5 | ||||
| -rw-r--r-- | cpp/include/Ice/LocalException.h | 12 |
3 files changed, 21 insertions, 2 deletions
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h index 662fe122422..6a192e446b3 100644 --- a/cpp/include/Ice/Config.h +++ b/cpp/include/Ice/Config.h @@ -124,4 +124,10 @@ private: } +// +// The Ice version +// +#define ICE_STRING_VERSION "0.0.1" +#define ICE_INT_VERSION 0x00000001 + #endif diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 1784ba87383..408597cd292 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -14,9 +14,10 @@ namespace Ice { -ICE_API Communicator_ptr initialize(int&, char*[]); +ICE_API Communicator_ptr initialize(int&, char*[], Int = ICE_INT_VERSION); ICE_API Communicator_ptr initializeWithProperties(int&, char*[], - const Properties_ptr&); + const Properties_ptr&, + Int = ICE_INT_VERSION); ICE_API Properties_ptr createProperties(); ICE_API Properties_ptr loadProperties(const std::string&); diff --git a/cpp/include/Ice/LocalException.h b/cpp/include/Ice/LocalException.h index a2724b12d06..a159c5d219d 100644 --- a/cpp/include/Ice/LocalException.h +++ b/cpp/include/Ice/LocalException.h @@ -52,6 +52,18 @@ public: virtual void raise() const; }; +class ICE_API VersionMismatchException : public LocalException +{ +public: + + VersionMismatchException(const char*, int); + VersionMismatchException(const VersionMismatchException&); + VersionMismatchException& operator=(const VersionMismatchException&); + virtual std::string toString() const; + virtual LocalException* clone() const; + virtual void raise() const; +}; + class ICE_API CommunicatorDestroyedException : public LocalException { public: |