5 files changed, 14 insertions, 14 deletions
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index 6c633ca811a..8a496256f77 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -43,11 +43,11 @@ typedef ::IceInternal::Handle< ::Ice::Stream> StreamPtr;
 
 typedef IceUtil::Exception Exception;
 
-class RuntimeException : public IceUtil::Exception
+class LocalException : public IceUtil::Exception
 {
 public:    
 
-    ICE_API RuntimeException(const char*, int);
+    ICE_API LocalException(const char*, int);
     virtual std::string ice_name() const = 0;
     virtual Exception* ice_clone() const = 0;
     virtual void ice_throw() const = 0;
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index f4ea8d13cc2..ff54bbfcc2b 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -12,7 +12,7 @@
 #define ICE_ICE_H
 
 #include <Ice/Initialize.h>
-#include <Ice/RuntimeException.h>
+#include <Ice/LocalException.h>
 #include <Ice/Properties.h>
 #include <Ice/Logger.h>
 #include <Ice/LoggerUtil.h>
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index 82f2af4b7d0..977601f5162 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -32,7 +32,7 @@ enum DispatchStatus
     DispatchObjectNotExist,
     DispatchFacetNotExist,
     DispatchOperationNotExist,
-    DispatchUnknownRuntimeException,
+    DispatchUnknownLocalException,
     DispatchUnknownUserException,
     DispatchUnknownException
 };
diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h
index 24900fc2cc0..2c6c236dc0e 100644
--- a/cpp/include/Ice/Outgoing.h
+++ b/cpp/include/Ice/Outgoing.h
@@ -21,7 +21,7 @@
 namespace Ice
 {
 
-class RuntimeException;
+class LocalException;
 
 }
 
@@ -38,14 +38,14 @@ class ICE_API NonRepeatable
 public:
 
     NonRepeatable(const NonRepeatable&);
-    NonRepeatable(const ::Ice::RuntimeException&);
-    const ::Ice::RuntimeException* get() const;
+    NonRepeatable(const ::Ice::LocalException&);
+    const ::Ice::LocalException* get() const;
 
 private:
 
     const NonRepeatable& operator=(const NonRepeatable&);
 
-    std::auto_ptr< ::Ice::RuntimeException> _ex;
+    std::auto_ptr< ::Ice::LocalException> _ex;
 };
 
 class ICE_API Outgoing : public ::IceUtil::noncopyable, public IceUtil::Monitor< IceUtil::Mutex >
@@ -58,7 +58,7 @@ public:
 
     bool invoke(); // Returns true if ok, false if user exception.
     void finished(BasicStream&);
-    void finished(const ::Ice::RuntimeException&);
+    void finished(const ::Ice::LocalException&);
 
     BasicStream* is();
     BasicStream* os();
@@ -72,7 +72,7 @@ private:
     const ConnectionPtr& _connection;
     const ReferencePtr& _reference;
 
-    std::auto_ptr< ::Ice::RuntimeException> _exception;
+    std::auto_ptr< ::Ice::LocalException> _exception;
 
     enum
     {
@@ -81,7 +81,7 @@ private:
 	StateOK,
 	StateLocationForward,
 	StateUserException,
-	StateRuntimeException,
+	StateLocalException,
     } _state;
 
     BasicStream _is;
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index df9994fb110..d4232282bb9 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -64,7 +64,7 @@ namespace Ice
 typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router> RouterPrx;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator> LocatorPrx;
 
-class RuntimeException;
+class LocalException;
 class LocationForward;
 
 }
@@ -112,8 +112,8 @@ public:
 
     ::IceInternal::ReferencePtr __reference() const;
     void __copyFrom(const ::Ice::ObjectPrx&);
-    void __handleException(const ::Ice::RuntimeException&, int&);
-    void __rethrowException(const ::Ice::RuntimeException&);
+    void __handleException(const ::Ice::LocalException&, int&);
+    void __rethrowException(const ::Ice::LocalException&);
     void __locationForward(const ::Ice::LocationForward&);
 
     ::IceInternal::Handle< ::IceDelegate::Ice::Object> __getDelegate();