summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2017-01-02 12:37:10 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2017-01-02 12:37:10 +0100
commitb9aa5bd4892d0de338420540480fc5a1f11cfae7 (patch)
treef550e6b860a391ba37d62073eee6f706e610cdbc /TAO/tao
parent888473f332f9a3f57cf31036c72ce51782883e2c (diff)
downloadATCD-b9aa5bd4892d0de338420540480fc5a1f11cfae7.tar.gz
Fixed typo
* ACE/ACEXML/common/DTD_Manager.h: * ACE/ACEXML/common/NamespaceSupport.h: * ACE/ACEXML/parser/debug_validator/Debug_DTD_Manager.h: * ACE/ace/Containers_T.h: * ACE/ace/DLL.h: * ACE/ace/QoS/QoS_Session.h: * ACE/ace/QoS/QoS_Session_Impl.cpp: * ACE/ace/QoS/QoS_Session_Impl.h: * ACE/ace/RB_Tree.h: * ACE/ace/SSL/SSL_SOCK_Stream.cpp: * ACE/ace/SSL/SSL_SOCK_Stream.inl: * ACE/ace/Select_Reactor_T.cpp: * ACE/ace/TP_Reactor.cpp: * ACE/ace/Token.cpp: * ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h: * ACE/examples/APG/Signals/SigHandler.cpp: * ACE/examples/APG/Signals/SigHandlers.cpp: * ACE/examples/Reactor/Proactor/test_aiosig.cpp: * ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp: * ACE/examples/Reactor/WFMO_Reactor/APC.cpp: * ACE/examples/Reactor/WFMO_Reactor/Abandoned.cpp: * ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp: * ACE/tests/Cached_Accept_Conn_Test.cpp: * ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp: * ACE/tests/Dev_Poll_Reactor_Test.cpp: * TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp: * TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp: * TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h: * TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp: * TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h: * TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp: * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp: * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: * TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp: * TAO/orbsvcs/tests/Concurrency/CC_command.cpp: * TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp: * TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h: * TAO/tao/Connection_Handler.cpp: * TAO/tao/IIOP_Connector.cpp: * TAO/tao/Invocation_Utils.h: * TAO/tao/LF_CH_Event.h: * TAO/tao/ORB_Core.cpp: * TAO/tao/Stub.h: * TAO/tao/Stub.inl: * TAO/tao/Transport.h: * TAO/tests/Bug_1495_Regression/Threaded_Server.cpp: * TAO/tests/Bug_1495_Regression/server_interceptor.cpp: * TAO/tests/Bug_3748_Regression/client.cpp: * TAO/tests/DII_AMI_Forward/server_interceptor.cpp: * TAO/tests/DynValue_Test/main.cpp: * TAO/tests/Explicit_Event_Loop/client.cpp: * TAO/tests/Explicit_Event_Loop/server.cpp: * TAO/tests/IORManipulation/IORTest.cpp: * TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp: * TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp: * TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp: * TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp: * TAO/tests/TransportCurrent/Framework/client.cpp: * TAO/tests/TransportCurrent/IIOP/client.cpp:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Connection_Handler.cpp2
-rw-r--r--TAO/tao/IIOP_Connector.cpp2
-rw-r--r--TAO/tao/Invocation_Utils.h2
-rw-r--r--TAO/tao/LF_CH_Event.h2
-rw-r--r--TAO/tao/ORB_Core.cpp2
-rw-r--r--TAO/tao/Stub.h2
-rw-r--r--TAO/tao/Stub.inl2
-rw-r--r--TAO/tao/Transport.h2
8 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index f2da6b6f89b..728338137c6 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -131,7 +131,7 @@ TAO_Connection_Handler::svc_i (void)
// We exit of the loop if
// - If the ORB core is shutdown by another thread
// - Or if the transport is null. This could happen if an error
- // occured.
+ // occurred.
// - Or if during processing a return value of -1 is received.
while (!this->orb_core_->has_shutdown () && result >= 0)
{
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 890a1ba5cdf..33b73629a3b 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -529,7 +529,7 @@ TAO_IIOP_Connector::complete_connection (int result,
// closing the connection. However the remainder of this method
// only checked to see if the keep_waiting status was true, and bump
// the refcount then. However if the status was really
- // error_detected, then no bump in refcount occured allowing the
+ // error_detected, then no bump in refcount occurred allowing the
// connection_handler's close_handler method to effectively steal
// the reference to be handed back to the caller. That would then
// trigger an abort as the profile_transport_resolver (our caller)
diff --git a/TAO/tao/Invocation_Utils.h b/TAO/tao/Invocation_Utils.h
index cc44ae31a08..db496a5484b 100644
--- a/TAO/tao/Invocation_Utils.h
+++ b/TAO/tao/Invocation_Utils.h
@@ -29,7 +29,7 @@ namespace TAO
/// Initial state of the FSM in the invocation class.
TAO_INVOKE_START = 0,
/// The request must be restarted, a temporary failure has
- /// occured.
+ /// occurred.
TAO_INVOKE_RESTART,
/// invoke() call successful. Final state of the FSM.
TAO_INVOKE_SUCCESS,
diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h
index 87553f17d6e..ab3bdd0c5ba 100644
--- a/TAO/tao/LF_CH_Event.h
+++ b/TAO/tao/LF_CH_Event.h
@@ -89,7 +89,7 @@ private:
* LFS_TIMEOUT - The event has timed out.
*
* LFS_CONNECTION_CLOSED - The connection was closed since
- * an error occured while trying to
+ * an error occurred while trying to
* establish connection
*
* Event State Diagram
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index fe48641dbac..b96728d06ad 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -3258,7 +3258,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook)
// calls this function as part of pre_init processing, and this call
// happes for every ORB instance. This was the case before these The
// latter call occurs when the messaging library is loaded. The
- // redundant calls occured then as well. Second, it isn't clear how
+ // redundant calls occurred then as well. Second, it isn't clear how
// a lock in this static method would react in the face of windows
// dlls, shared memory segments, etc. Therefore we are continuing to
// keep this code lockless as it always was, assuming no
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index c6b6a29427e..0f5ac9a6bbe 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -145,7 +145,7 @@ public:
/// Obtain a pointer to the forwarded profile set
TAO_MProfile *forward_profiles (void);
- /// True if permanent location forward occured, in this case the lock must be set and the
+ /// True if permanent location forward occurred, in this case the lock must be set and the
// Manage forward and base profiles.
/**
diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl
index 37913698761..7c638ccf206 100644
--- a/TAO/tao/Stub.inl
+++ b/TAO/tao/Stub.inl
@@ -103,7 +103,7 @@ TAO_Stub::next_profile_i (void)
{
TAO_Profile *pfile_next = 0;
- // First handle the case that a permanent forward occured
+ // First handle the case that a permanent forward occurred
if (this->forward_profiles_perm_) // the permanent forward defined
// at bottom of stack
// forward_profiles_
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 2060467e00a..629e6f5c708 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -1211,7 +1211,7 @@ private:
TAO_Codeset_Translator_Base *char_translator_;
TAO_Codeset_Translator_Base *wchar_translator_;
- /// The tcs_set_ flag indicates that negotiation has occured and so the
+ /// The tcs_set_ flag indicates that negotiation has occurred and so the
/// translators are correct, since a null translator is valid if both ends
/// are using the same codeset, whatever that codeset might be.
CORBA::Boolean tcs_set_;