Fixed typos. (#1580)

23 files changed, 32 insertions, 32 deletions

diff --git a/cpp/src/Glacier2/Instrumentation.ice b/cpp/src/Glacier2/Instrumentation.ice
index e38da747efa..4f644f6c439 100644
--- a/cpp/src/Glacier2/Instrumentation.ice
+++ b/cpp/src/Glacier2/Instrumentation.ice
@@ -73,7 +73,7 @@ local interface ObserverUpdater
      * Update the router sessions.
      *
      * When called, this method goes through all the sessions and for
-     * each sesssion RouterObserver::getSessionObserver is
+     * each session RouterObserver::getSessionObserver is
      * called. The implementation of getSessionObserver has the
      * possibility to return an updated observer if necessary.
      *
diff --git a/cpp/src/Ice/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp
index 221e2a3340c..bf76c436446 100644
--- a/cpp/src/Ice/CountDownLatch.cpp
+++ b/cpp/src/Ice/CountDownLatch.cpp
@@ -17,7 +17,7 @@ IceUtilInternal::CountDownLatch::CountDownLatch(int count) :
     _event = CreateEvent(0, TRUE, FALSE, 0);
     if(_event == 0)
     {
-        throw  IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
+        throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
     }
 #else
     int rc = pthread_mutex_init(&_mutex, 0);
diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp
index 4d4f39405a2..b673d0f1d4e 100644
--- a/cpp/src/Ice/EndpointFactory.cpp
+++ b/cpp/src/Ice/EndpointFactory.cpp
@@ -24,7 +24,7 @@ IceInternal::EndpointFactory::~EndpointFactory()
 void
 IceInternal::EndpointFactory::initialize()
 {
-    // Nothing to do, can be overriden by specialization to finish initialization.
+    // Nothing to do, can be overridden by specialization to finish initialization.
 }
 
 IceInternal::EndpointFactoryPlugin::EndpointFactoryPlugin(const CommunicatorPtr& communicator,
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index 1c46219cd44..fc6f9ad7350 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -93,6 +93,6 @@ IceInternal::EndpointI::initWithOptions(vector<string>& args)
 bool
 IceInternal::EndpointI::checkOption(const string&, const string&, const string&)
 {
-    // Must be overriden to check for options.
+    // Must be overridden to check for options.
     return false;
 }
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp
index 180e6fa2888..5cc48b188d4 100644
--- a/cpp/src/Ice/InputStream.cpp
+++ b/cpp/src/Ice/InputStream.cpp
@@ -376,12 +376,12 @@ Ice::InputStream::readAndCheckSeqSize(int minSize)
     // top-level sequence or enclosed sequence it doesn't really matter).
     //
     // Otherwise, we are reading an enclosed sequence and we have to bump
-    // _minSeqSize by the minimum size that this sequence will  require on
+    // _minSeqSize by the minimum size that this sequence will require on
     // the stream.
     //
     // The goal of this check is to ensure that when we start un-marshalling
     // a new sequence, we check the minimal size of this new sequence against
-    // the estimated remaining buffer size. This estimatation is based on
+    // the estimated remaining buffer size. This estimation is based on
     // the minimum size of the enclosing sequences, it's _minSeqSize.
     //
     if(_startSeq == -1 || i > (b.begin() + _startSeq + _minSeqSize))
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp
index 3142164b805..bc99ff922d9 100644
--- a/cpp/src/Ice/MetricsAdminI.cpp
+++ b/cpp/src/Ice/MetricsAdminI.cpp
@@ -656,7 +656,7 @@ MetricsAdminI::updated(const PropertyDict& props)
     {
         if(p->first.find("IceMX.") == 0)
         {
-            // Udpate the metrics views using the new configuration.
+            // Update the metrics views using the new configuration.
             try
             {
                 updateViews();
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index ccf78cc66bd..f411bc17a43 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -1860,7 +1860,7 @@ IceInternal::recvTruncated()
 {
 #ifdef _WIN32
     int err = WSAGetLastError();
-    return  err == WSAEMSGSIZE || err == ERROR_MORE_DATA;
+    return err == WSAEMSGSIZE || err == ERROR_MORE_DATA;
 #else
     // We don't get an error under Linux if a datagram is truncated.
     return false;
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 9e9f561ac22..1f84ae463c7 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -1304,7 +1304,7 @@ ObjectAdapterI::computePublishedEndpoints()
         if(endpoints.empty())
         {
             //
-            // If the PublishedEndpoints property isn't set, we compute the published enpdoints
+            // If the PublishedEndpoints property isn't set, we compute the published endpoints
             // from the OA endpoints, expanding any endpoints that may be listening on INADDR_ANY
             // to include actual addresses in the published endpoints.
             //
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 44ba61e9527..37872aba7ec 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -53,7 +53,7 @@ OutgoingAsyncBase::exception(const Exception& ex)
 bool
 OutgoingAsyncBase::response()
 {
-    assert(false); // Must be overriden by request that can handle responses
+    assert(false); // Must be overridden by request that can handle responses
     return false;
 }
 
@@ -409,7 +409,7 @@ OutgoingAsyncBase::getCookie() const
 const std::string&
 OutgoingAsyncBase::getOperation() const
 {
-    assert(false); // Must be overriden
+    assert(false); // Must be overridden
     static string empty;
     return empty;
 }
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index 63da0b2c3e9..b8d57f1cce3 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -427,7 +427,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
 
     //
     // Always check the static plugin factory table first, it takes
-    // precedence over the the entryPoint specified in the plugin
+    // precedence over the entryPoint specified in the plugin
     // property value.
     //
     if(factories)
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index f6087267c81..fcffb15c1cd 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -886,7 +886,7 @@ Activator::activate(const string& name,
         }
 
         //
-        // If an error occured before the exec() we do some cleanup and throw.
+        // If an error occurred before the exec() we do some cleanup and throw.
         //
         if(!message.empty())
         {
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h
index 19f60f2ba11..a1bb3a66b70 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.h
+++ b/cpp/src/IceGrid/AllocatableObjectCache.h
@@ -34,7 +34,7 @@ public:
     virtual void released(const SessionIPtr&);
     virtual bool canTryAllocate();
 
-    void  destroy();
+    void destroy();
     virtual void checkAllocatable();
 
 private:
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index acaec2b9d1d..b4a957f9ccc 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -2606,19 +2606,19 @@ NodeHelper::printDiff(Output& out, const NodeHelper& helper) const
 
     if(_def.loadFactor != helper._def.loadFactor)
     {
-        out << nl << "load factor udpated";
+        out << nl << "load factor updated";
     }
     if(_def.description != helper._def.description)
     {
-        out << nl << "description udpated";
+        out << nl << "description updated";
     }
     if(!updatedPs.empty() || !removedPs.empty())
     {
-        out << nl << "property sets udpated";
+        out << nl << "property sets updated";
     }
     if(!variables.empty() || !removeVariables.empty())
     {
-        out << nl << "variables udpated";
+        out << nl << "variables updated";
     }
     if(!updated.empty() || !removed.empty())
     {
@@ -3180,7 +3180,7 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const
         Ice::StringSeq removeVariables = getDictRemovedElts(helper._def.variables, _def.variables);
         if(!variables.empty() || !removeVariables.empty())
         {
-            out << nl << "variables udpated";
+            out << nl << "variables updated";
         }
     }
     {
@@ -3194,7 +3194,7 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const
         Ice::StringSeq removed = getDictRemovedElts(helper._def.propertySets, _def.propertySets);
         if(!updt.empty() || !removed.empty())
         {
-            out << nl << "property sets udpated";
+            out << nl << "property sets updated";
         }
     }
     {
diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp
index 110826408c7..628e54ca989 100644
--- a/cpp/src/IceGrid/FileCache.cpp
+++ b/cpp/src/IceGrid/FileCache.cpp
@@ -108,7 +108,7 @@ FileCache::getOffsetFromEnd(const string& file, int originalCount)
 
     if(is.bad())
     {
-        throw FileNotAvailableException("unrecoverable error occured while reading file `" + file + "'");
+        throw FileNotAvailableException("unrecoverable error occurred while reading file `" + file + "'");
     }
 
     if(lines.empty())
@@ -205,7 +205,7 @@ FileCache::read(const string& file, Ice::Long offset, int size, Ice::Long& newOf
 
     if(is.bad())
     {
-        throw FileNotAvailableException("unrecoverable error occured while reading file `" + file + "'");
+        throw FileNotAvailableException("unrecoverable error occurred while reading file `" + file + "'");
     }
 
     return is.eof();
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index c73c4d9ac57..aa65a254a69 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -2253,7 +2253,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
     _stdOutFile = getProperty(props, "Ice.StdOut");
 
     //
-    // If the server is a session server and it wasn't udpated but
+    // If the server is a session server and it wasn't updated but
     // just released by a session, we don't update the configuration,
     // it will be done when the server is re-allocated.
     //
diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h
index 5184bd2b19a..761fb6fde98 100644
--- a/cpp/src/IceGrid/SessionI.h
+++ b/cpp/src/IceGrid/SessionI.h
@@ -140,7 +140,7 @@ class ClientSSLSessionManagerI : public virtual Glacier2::SSLSessionManager
 {
 public:
 
-    ClientSSLSessionManagerI(const  ClientSessionFactoryPtr&);
+    ClientSSLSessionManagerI(const ClientSessionFactoryPtr&);
 
     virtual Glacier2::SessionPrx create(const Glacier2::SSLInfo&, const Glacier2::SessionControlPrx&,
                                         const Ice::Current&);
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index e5993b178d4..e8c88b3f519 100644
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -147,7 +147,7 @@ IceSSL::getTrustErrorDescription(TrustError error)
 {
     switch(error)
     {
-        case  IceSSL::ICE_ENUM(TrustError, NoError):
+        case IceSSL::ICE_ENUM(TrustError, NoError):
         {
             return "no error";
         }
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
index 2ae65181228..235b985b562 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
@@ -443,7 +443,7 @@ IceSSL::SecureTransport::TransceiverI::write(IceInternal::Buffer& buf)
 
     if(buf.i == buf.b.end())
     {
-        return  IceInternal::SocketOperationNone;
+        return IceInternal::SocketOperationNone;
     }
 
     //
@@ -522,7 +522,7 @@ IceSSL::SecureTransport::TransceiverI::read(IceInternal::Buffer& buf)
 
     if(buf.i == buf.b.end())
     {
-        return  IceInternal::SocketOperationNone;
+        return IceInternal::SocketOperationNone;
     }
 
     _delegate->getNativeInfo()->ready(IceInternal::SocketOperationRead, false);
diff --git a/cpp/src/IceSSL/SecureTransportUtil.cpp b/cpp/src/IceSSL/SecureTransportUtil.cpp
index 5e79bedef66..37e3830b793 100644
--- a/cpp/src/IceSSL/SecureTransportUtil.cpp
+++ b/cpp/src/IceSSL/SecureTransportUtil.cpp
@@ -402,7 +402,7 @@ loadPrivateKey(const string& file, SecCertificateRef cert, SecKeychainRef keycha
     item.retain(static_cast<SecCertificateRef>(const_cast<void*>(CFArrayGetValueAtIndex(added.get(), 0))));
 
     //
-    // Create the association between the private  key and the certificate,
+    // Create the association between the private key and the certificate,
     // kSecKeyLabel attribute should match the subject key identifier.
     //
     vector<SecKeychainAttribute> attributes;
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp
index 22c6ed1ac09..d007ba6cc06 100644
--- a/cpp/src/IceStorm/Admin.cpp
+++ b/cpp/src/IceStorm/Admin.cpp
@@ -8,7 +8,7 @@
 #include <Ice/SliceChecksums.h>
 #include <IceStorm/Parser.h>
 
-#ifdef  _WIN32
+#ifdef _WIN32
 #   include <fcntl.h>
 #   include <io.h>
 #endif
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index 9df599eec3c..6d927bf4727 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -784,7 +784,7 @@ Subscriber::error(bool dec, const Ice::Exception& e)
 
     //
     // It's possible to be already in the error state if the queue maximum size
-    // has been reached or if an ObjectNotExistException occured before.
+    // has been reached or if an ObjectNotExistException occurred before.
     //
     if(_state >= SubscriberStateError)
     {
diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp
index 2af835db0c8..ec5668a4e75 100644
--- a/cpp/src/IceUtil/StringConverter.cpp
+++ b/cpp/src/IceUtil/StringConverter.cpp
@@ -5,7 +5,7 @@
 // TODO codecvt was deprecated in C++17 and cause build failures in C++17 mode
 // For VC++ we should replace this code with MultiByteToWideChar() and WideCharToMultiByte()
 #if defined(_MSC_VER) && (_MSVC_LANG >= 201703L)
-#   define  _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
+#   define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
 #elif (__cplusplus >= 201703L)
 #   include <IceUtil/DisableWarnings.h>
 #endif
diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp
index 583b37a8671..33f75b7d3e5 100644
--- a/cpp/src/slice2swift/SwiftUtil.cpp
+++ b/cpp/src/slice2swift/SwiftUtil.cpp
@@ -1120,7 +1120,7 @@ SwiftGenerator::typeToString(const TypePtr& type,
 
     string t = "";
     //
-    // The current module were the type is being used
+    // The current module where the type is being used
     //
     string currentModule = getSwiftModule(getTopLevelModule(toplevel));
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);