diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-03-15 16:43:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-15 16:43:16 +0100 |
commit | 00b8e0b09187145be9535fa85cbab82877a61495 (patch) | |
tree | a0e46508e8773d3fc3699dd6a5075be9c841ec32 | |
parent | 56cc64165945705890440d322139cb59efaf9005 (diff) | |
parent | 2e72cd5a4d1dfcc0044bf874eb43ae7e9ebbee3b (diff) | |
download | ATCD-00b8e0b09187145be9535fa85cbab82877a61495.tar.gz |
Merge pull request #378 from jwillemsen/master
Fixed typos in comments
-rw-r--r-- | TAO/docs/orbsvcs.html | 6 | ||||
-rw-r--r-- | TAO/docs/pluggable_protocols/index.html | 2 | ||||
-rw-r--r-- | TAO/docs/releasenotes/ftrt_ec.html | 2 | ||||
-rw-r--r-- | TAO/docs/releasenotes/index.html | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/NestedUpcall/MT_Client_Test/client.cpp | 4 |
8 files changed, 12 insertions, 14 deletions
diff --git a/TAO/docs/orbsvcs.html b/TAO/docs/orbsvcs.html index b4d2f0c1aa8..94e7677c333 100644 --- a/TAO/docs/orbsvcs.html +++ b/TAO/docs/orbsvcs.html @@ -48,7 +48,7 @@ bgcolor="#ffffff"> the users control over collocation of the services implementation. As a first cut all the service implementations are included in the orbsvcs library <CODE>$TAO_ROOT/orbsvcs/orbsvcs</CODE>. - Since there are serveral services and each one is implemented + Since there are several services and each one is implemented using several files we have given a different directory to each service. This structure could also simplify a future split into several @@ -79,7 +79,7 @@ bgcolor="#ffffff"> <TR> <TD>Event Service</TD> <TD><CODE>orbsvcs/orbsvcs/CosEvent</CODE></TD> - <TD>Pradeep Gore <pradeep at oomworks dot com> + <TD>Pradeep Gore <pradeep at oomworks dot com> and OCI<taosupport at ociweb dot com> </TD> </TR> <TR> @@ -179,7 +179,7 @@ bgcolor="#ffffff"> executables if they want any changes in CORBA policies or would like to set their own bits when running a service. The executables that are packed with the TAO distribution should be - viewed as an executable with a basic subset of features. + viewed as an executable with a basic subset of features. The binaries in question are located in <CODE>$TAO_ROOT/orbsvcs</CODE>, and the list includes: </P> diff --git a/TAO/docs/pluggable_protocols/index.html b/TAO/docs/pluggable_protocols/index.html index 88817c7b5ab..3c277c19852 100644 --- a/TAO/docs/pluggable_protocols/index.html +++ b/TAO/docs/pluggable_protocols/index.html @@ -1054,7 +1054,7 @@ public: <BR> // To support pluggable we need to abstract away the connect() <BR> - // method so it can be called from the GIOP code independant of the + // method so it can be called from the GIOP code independent of the <BR> // actual transport protocol in use. <BR> diff --git a/TAO/docs/releasenotes/ftrt_ec.html b/TAO/docs/releasenotes/ftrt_ec.html index c0c705b633e..45a7a59aa82 100644 --- a/TAO/docs/releasenotes/ftrt_ec.html +++ b/TAO/docs/releasenotes/ftrt_ec.html @@ -56,7 +56,7 @@ build it. See <a href="../../../bin/MakeProjectCreator/USAGE">here</a> for the i <br> <h3> Programs</h3> -There are serveral programs in $TAO_ROOT/orbsvcs/FTRT_Event_Servce directory: +There are several programs in $TAO_ROOT/orbsvcs/FTRT_Event_Servce directory: <p>ftrt_eventservice : Located under $TAO_ROOT/orbsvcs/FTRT_Event_Servce/Event_Service directory. It implements the functionality of fault tolerant event channel. It can be started directly or be started by the ftrtec_factory_service. diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html index a6afd718313..a529c8898a2 100644 --- a/TAO/docs/releasenotes/index.html +++ b/TAO/docs/releasenotes/index.html @@ -743,7 +743,7 @@ CORBA specification. <li> The generated sequence classes should not be generated per sequence, but per type and parent scope. Which means, that the overhead of having the -source code generated serveral times should be reduced. To do this, an +source code generated several times should be reduced. To do this, an extra pass over the internal representation of the IDL file has to be done.</li> <li> diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index b2c9b7faf04..94bd93658fc 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -324,7 +324,7 @@ Subscribe_StructuredPushConsumer::push_structured_event ACE_DEBUG ((LM_DEBUG, "Structured Subscribe Consumer %d received subscribed event, domain = %s, type = %s\n", this->proxy_supplier_id_, domain_name, type_name)); else - ACE_ERROR ((LM_ERROR, "Error: Structured Subscribe Consumer %d received not subcribed event , domain = %s, type = %s\n", + ACE_ERROR ((LM_ERROR, "Error: Structured Subscribe Consumer %d received not subscribed event , domain = %s, type = %s\n", this->proxy_supplier_id_, domain_name, type_name)); if (++g_result_count == EVENT_COUNT) diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp index 3b0eca92ddd..9d8b067c262 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp @@ -118,15 +118,13 @@ TAO_Notify_ThreadPool_Consumer::disconnect (void) void TAO_Notify_ThreadPool_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, - const CosNotification::EventTypeSeq & /*removed*/ - ) + const CosNotification::EventTypeSeq & /*removed*/) { // No-Op. } void -TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/ - ) +TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index 26c57aa73fe..09cdf6e0b86 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -107,7 +107,7 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa) this->adopt_poa (auto_object_poa.release ()); // Note topology factory is configured separately from the "builder" mediated - // objects since it is independant of the "style" of Notification Service. + // objects since it is independent of the "style" of Notification Service. this->topology_factory_ = ACE_Dynamic_Service <TAO_Notify::Topology_Factory>::instance ("Topology_Factory"); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index abea802b15f..03e0d81e9ea 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -3,8 +3,8 @@ /** * @file client.cpp * - * Start one server thread calling a distant MT Object serveral times, - * also starting serveral client threads which call the MT Object too. + * Start one server thread calling a distant MT Object several times, + * also starting several client threads which call the MT Object too. * The server does nested upcalls. * * @author Michael Kircher |