diff options
-rw-r--r-- | ACE/ace/CDR_Size.h | 2 | ||||
-rw-r--r-- | ACE/ace/CDR_Stream.h | 14 | ||||
-rw-r--r-- | ACE/ace/Codecs.h | 1 | ||||
-rw-r--r-- | ACE/tests/Upgradable_RW_Test.cpp | 2 | ||||
-rw-r--r-- | TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl | 4 | ||||
-rw-r--r-- | TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp | 2 | ||||
-rw-r--r-- | TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp | 2 | ||||
-rw-r--r-- | TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/POA/Generic_Servant/client.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/POA/TIE/client.cpp | 2 |
11 files changed, 17 insertions, 18 deletions
diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h index ad229bca388..0a29edf58a1 100644 --- a/ACE/ace/CDR_Size.h +++ b/ACE/ace/CDR_Size.h @@ -44,7 +44,7 @@ public: ACE_SizeCDR (ACE_CDR::Octet major_version = ACE_CDR_GIOP_MAJOR_VERSION, ACE_CDR::Octet minor_version = ACE_CDR_GIOP_MINOR_VERSION); - /// Returns @c false if an error has ocurred. + /// Returns @c false if an error has occurred. bool good_bit (void) const; /// Reset current size. diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h index 0413e392faa..d085fb2ccd1 100644 --- a/ACE/ace/CDR_Stream.h +++ b/ACE/ace/CDR_Stream.h @@ -138,8 +138,8 @@ public: ACE_CDR::Octet giop_minor_version = ACE_CDR_GIOP_MINOR_VERSION); /// Build a CDR stream with an initial data block, it will *not* remove - /// <data_block>, since it did not allocated it. It's important to be - // careful with the alignment of <data_block>. + /// @a data_block, since it did not allocated it. It's important to be + /// careful with the alignment of <data_block>. /** * Create an output stream from an arbitrary data block, care must be * exercised with alignment, because this constructor will align if @@ -330,7 +330,7 @@ public: * type to insert. This requirement is satisfied by using one of the * placeholder-writing methods to align the stream for the anticipated * value and obtain the correct location. - * Treatment of @a x with repect to byte swapping is the same as for when + * Treatment of @a x with respect to byte swapping is the same as for when * any value is inserted. * * @param x The value to insert into the specified location. @@ -375,7 +375,7 @@ public: ACE_CDR::Boolean append_string (ACE_InputCDR &); //@} - /// Returns @c false if an error has ocurred. + /// Returns @c false if an error has occurred. /** * @note The only expected error is to run out of memory. */ @@ -677,7 +677,7 @@ public: ACE_CDR::Octet minor_version = ACE_CDR_GIOP_MINOR_VERSION, ACE_Lock* lock = 0); - /// Create an input stream from an ACE_Data_Block. The <flag> + /// Create an input stream from an ACE_Data_Block. The @a flag /// indicates whether the @a data can be deleted by the CDR stream /// or not ACE_InputCDR (ACE_Data_Block *data, @@ -733,7 +733,7 @@ public: ACE_InputCDR &rhs_; }; - /// Transfer the contents from <rhs> to a new CDR + /// Transfer the contents from @a rhs to a new CDR ACE_InputCDR (Transfer_Contents rhs); /// Destructor @@ -1048,7 +1048,7 @@ private: // We could use void* or char* to make the interface more // consistent, but using native types let us exploit the strict // alignment requirements of CDR streams and implement the - // operations using asignment. + // operations using assignment. /** * Read an array of @a length elements, each of @a size bytes and the diff --git a/ACE/ace/Codecs.h b/ACE/ace/Codecs.h index 1f0ee3a9a89..f8d68639753 100644 --- a/ACE/ace/Codecs.h +++ b/ACE/ace/Codecs.h @@ -55,7 +55,6 @@ public: * @return Encoded Base64 data in byte stream or NULL if input data cannot * be encoded. */ - static ACE_Byte* encode (const ACE_Byte* input, const size_t input_len, size_t* output_len, diff --git a/ACE/tests/Upgradable_RW_Test.cpp b/ACE/tests/Upgradable_RW_Test.cpp index 2f413cf40d3..f7bf15892ca 100644 --- a/ACE/tests/Upgradable_RW_Test.cpp +++ b/ACE/tests/Upgradable_RW_Test.cpp @@ -306,7 +306,7 @@ Time_Calculation ::print_stats (void) } else ACE_ERROR ((LM_ERROR, - ACE_TEXT ("\tNo time stats printed. Zero iterations or error ocurred.\n"))); + ACE_TEXT ("\tNo time stats printed. Zero iterations or error occurred.\n"))); } static int diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp index 816f42d67e0..12fe3748671 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp @@ -25,7 +25,7 @@ ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) } catch(...) { - std::cerr << "Exception ocurred creating ClientInterceptor" << std::endl; + std::cerr << "Exception occurred creating ClientInterceptor" << std::endl; } PortableInterceptor::ClientRequestInterceptor_var ci_interceptor = diff --git a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl index 068525c8aa4..e6cfb8e073b 100644 --- a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl @@ -281,14 +281,14 @@ module RtecEventChannelAdmin */ interface Observer { - /// A change in the list of consumers has ocurred. + /// A change in the list of consumers has occurred. /** * The disjunction of the subscriptions is sent to the * observer. */ void update_consumer (in ConsumerQOS sub); - /// A change in the list of suppliers has ocurred. + /// A change in the list of suppliers has occurred. /** * The list of all the event publications is passed to the * observer. diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp index cd0404ae066..448ceee2ab8 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp @@ -347,7 +347,7 @@ DII_Cubit_Client::print_stats (const char *call_name, else ACE_ERROR ((LM_ERROR, "\tNo time stats printed. " - "Call count zero or error ocurred.\n")); + "Call count zero or error occurred.\n")); ACE_DEBUG ((LM_DEBUG, "\t%d calls, %d errors\n", diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp index 4d2e8704bd0..3769351bdb3 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp @@ -1151,7 +1151,7 @@ Cubit_Client::print_stats (const char *call_name, { ACE_ERROR ((LM_ERROR, "\tNo time stats printed." - " Call count zero or error ocurred.\n")); + " Call count zero or error occurred.\n")); } } diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index 600d9ba4851..eeafad168a6 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -138,7 +138,7 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time) } else ACE_ERROR ((LM_ERROR, - "\tNo time stats printed. Zero iterations or error ocurred.\n")); + "\tNo time stats printed. Zero iterations or error occurred.\n")); } diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp index 3ed1ef070f4..c55fa2301cb 100644 --- a/TAO/tests/POA/Generic_Servant/client.cpp +++ b/TAO/tests/POA/Generic_Servant/client.cpp @@ -97,7 +97,7 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time, } else ACE_ERROR ((LM_ERROR, - "\tNo time stats printed. Zero iterations or error ocurred.\n")); + "\tNo time stats printed. Zero iterations or error occurred.\n")); } int diff --git a/TAO/tests/POA/TIE/client.cpp b/TAO/tests/POA/TIE/client.cpp index 85b53b9baf1..857df3753e1 100644 --- a/TAO/tests/POA/TIE/client.cpp +++ b/TAO/tests/POA/TIE/client.cpp @@ -96,7 +96,7 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time, } else ACE_ERROR ((LM_ERROR, - "\tNo time stats printed. Zero iterations or error ocurred.\n")); + "\tNo time stats printed. Zero iterations or error occurred.\n")); } template <class T, class T_var> |