summaryrefslogtreecommitdiff
path: root/cpp/include
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include')
-rw-r--r--cpp/include/Ice/Initialize.h4
-rw-r--r--cpp/include/Ice/MetricsObserverI.h2
-rw-r--r--cpp/include/IceUtil/Cond.h2
-rw-r--r--cpp/include/IceUtil/InputUtil.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index 44d2338d611..70ad7fe0e04 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -630,7 +630,7 @@ typedef Ice::Plugin* (*PluginFactory)(const ::Ice::CommunicatorPtr& communicator
* @param factory The factory function.
* @param loadOnInit If true, the plug-in is always loaded (created) during communicator initialization,
* even if Ice.Plugin.name is not set. When false, the plug-in is loaded (created) during communication
- * initialization only if Ice.Plugin.name is set to a non-empty value (e.g.: Ice.Plugin.IceSSL=1).
+ * initialization only if Ice.Plugin.name is set to a non-empty value (e.g.: Ice.Plugin.IceSSL=1).
*/
ICE_API void registerPluginFactory(const std::string& name, PluginFactory factory, bool loadOnInit);
@@ -921,7 +921,7 @@ public:
private:
- CommunicatorPtr _communicator;
+ CommunicatorPtr _communicator;
};
/**
diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
index d2a3eea8a80..65424d51510 100644
--- a/cpp/include/Ice/MetricsObserverI.h
+++ b/cpp/include/Ice/MetricsObserverI.h
@@ -34,7 +34,7 @@ public:
virtual void initMetrics(const ICE_INTERNAL_HANDLE<T>&) const
{
- // To be overriden in specialization to initialize state attributes
+ // To be overridden in specialization to initialize state attributes
}
protected:
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h
index eca7512d0a2..21ccccd0683 100644
--- a/cpp/include/IceUtil/Cond.h
+++ b/cpp/include/IceUtil/Cond.h
@@ -282,7 +282,7 @@ Cond::timedWaitImpl(const M& mutex, const Time& timeout) const
# ifdef __APPLE__
//
// The monotonic time is based on mach_absolute_time and pthread
- // condition variables require time from gettimeofday so we get
+ // condition variables require time from gettimeofday so we get
// the realtime time.
//
timeval tv = Time::now(Time::Realtime) + timeout;
diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h
index 7b808757295..fc3c3431087 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.h
@@ -35,7 +35,7 @@ ICE_API IceUtil::Int64 strToInt64(const char*, char**, int);
// - result == 0 indicates that no digits were available for conversion
// - result == "Int64 Min" or result == "Int64 Max" indicate underflow or overflow.
//
-ICE_API bool stringToInt64(const std::string&, IceUtil::Int64&);
+ICE_API bool stringToInt64(const std::string&, IceUtil::Int64&);
}