Fri Sep 24 12:32:44 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Containers_T.h:
        * ace/Containers_T.cpp:
        * ace/OS_NS_string.h:
        * ace/OS_NS_wchar.h:
          Fixed typo

4 files changed, 27 insertions, 27 deletions

diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp
index acb21bed337..91c51f3b398 100644
--- a/ACE/ace/Containers_T.cpp
+++ b/ACE/ace/Containers_T.cpp
@@ -1621,7 +1621,7 @@ template <class T> int
 ACE_Ordered_MultiSet<T>::find (const T &item,
                                ITERATOR &iter) const
 {
-  // search an occurance of item, using iterator's current position as a hint
+  // search an occurence of item, using iterator's current position as a hint
   ACE_DNode<T> *node = iter.current_;
   int const result = locate (item, node, node);
 
@@ -1779,7 +1779,7 @@ ACE_Ordered_MultiSet<T>::locate (const T &item, ACE_DNode<T> *start_position,
     return 0;
 }
 
-// Looks for first occurance of <item> in the ordered set, using the
+// Looks for first occurence of <item> in the ordered set, using the
 // passed starting position as a hint: if there is such an instance,
 // it updates the new_position pointer to point to one such node and
 // returns 0; if there is no such node, then if there is a node before
diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h
index 6442da5484b..5d7c182b850 100644
--- a/ACE/ace/Containers_T.h
+++ b/ACE/ace/Containers_T.h
@@ -1920,7 +1920,7 @@ private:
                    ACE_DNode<T> **new_position);
 
   /**
-   * Looks for first occurance of @a item in the ordered set, using the
+   * Looks for first occurence of @a item in the ordered set, using the
    * passed starting position as a hint: if there is such an instance, it
    * updates the new_position pointer to point to this node and returns 0;
    * if there is no such node, then if there is a node before where the
diff --git a/ACE/ace/OS_NS_string.h b/ACE/ace/OS_NS_string.h
index b126075e70e..be360bcb9d7 100644
--- a/ACE/ace/OS_NS_string.h
+++ b/ACE/ace/OS_NS_string.h
@@ -97,24 +97,24 @@ namespace ACE_OS {
   wchar_t *strcat (wchar_t *s, const wchar_t *t);
 #endif /* ACE_HAS_WCHAR */
 
-  /// Finds the first occurance of a character in a string (const char
+  /// Finds the first occurence of a character in a string (const char
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
   const char *strchr (const char *s, int c);
 
 #if defined (ACE_HAS_WCHAR)
-  /// Finds the first occurance of a character in a string (const wchar_t
+  /// Finds the first occurence of a character in a string (const wchar_t
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
   const wchar_t *strchr (const wchar_t *s, wchar_t c);
 #endif /* ACE_HAS_WCHAR */
 
-  /// Finds the first occurance of a character in a string (char version).
+  /// Finds the first occurence of a character in a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strchr (char *s, int c);
 
 #if defined (ACE_HAS_WCHAR)
-  /// Finds the first occurance of a character in a string (wchar_t version).
+  /// Finds the first occurence of a character in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *strchr (wchar_t *s, wchar_t c);
 #endif /* ACE_HAS_WCHAR */
@@ -219,21 +219,21 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_WCHAR_T *strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len);
 
-  /// Finds the first occurance of a character in an array (const char
+  /// Finds the first occurence of a character in an array (const char
   /// version).
   extern ACE_Export
   const char *strnchr (const char *s, int c, size_t len);
 
-  /// Finds the first occurance of a character in an array (const ACE_WCHAR_T
+  /// Finds the first occurence of a character in an array (const ACE_WCHAR_T
   /// version).
   extern ACE_Export
   const ACE_WCHAR_T *strnchr (const ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len);
 
-  /// Finds the first occurance of a character in an array (char version).
+  /// Finds the first occurence of a character in an array (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strnchr (char *s, int c, size_t len);
 
-  /// Finds the first occurance of a character in an array (ACE_WCHAR_T version).
+  /// Finds the first occurence of a character in an array (ACE_WCHAR_T version).
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_WCHAR_T *strnchr (ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len);
 
@@ -277,23 +277,23 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   size_t strnlen (const ACE_WCHAR_T *s, size_t maxlen);
 
-  /// Finds the first occurance of a substring in an array (const char
+  /// Finds the first occurence of a substring in an array (const char
   /// version).
   extern ACE_Export
   const char *strnstr (const char *s, const char *t, size_t len);
 
-  /// Finds the first occurance of a substring in an array (const wchar_t
+  /// Finds the first occurence of a substring in an array (const wchar_t
   /// version).
   extern ACE_Export
   const ACE_WCHAR_T *strnstr (const ACE_WCHAR_T *s,
                               const ACE_WCHAR_T *t,
                               size_t len);
 
-  /// Finds the first occurance of a substring in an array (char version).
+  /// Finds the first occurence of a substring in an array (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strnstr (char *s, const char *t, size_t len);
 
-  /// Finds the first occurance of a substring in an array (wchar_t version).
+  /// Finds the first occurence of a substring in an array (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_WCHAR_T *strnstr (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len);
 
@@ -317,35 +317,35 @@ namespace ACE_OS {
   wchar_t *strpbrk (wchar_t *s1, const wchar_t *s2);
 #endif /* ACE_HAS_WCHAR */
 
-  /// Finds the last occurance of a character in a string (const char
+  /// Finds the last occurence of a character in a string (const char
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
   const char *strrchr (const char *s, int c);
 
 #if defined (ACE_HAS_WCHAR)
-  /// Finds the last occurance of a character in a string (const wchar_t
+  /// Finds the last occurence of a character in a string (const wchar_t
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
   const wchar_t *strrchr (const wchar_t *s, wchar_t c);
 #endif /* ACE_HAS_WCHAR */
 
-  /// Finds the last occurance of a character in a string (char version).
+  /// Finds the last occurence of a character in a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strrchr (char *s, int c);
 
 #if defined (ACE_HAS_WCHAR)
-  /// Finds the last occurance of a character in a string (wchar_t version).
+  /// Finds the last occurence of a character in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *strrchr (wchar_t *s, wchar_t c);
 #endif /* ACE_HAS_WCHAR */
 
 #if defined (ACE_LACKS_STRRCHR)
-  /// Emulated strrchr (char version) - Finds the last occurance of a
+  /// Emulated strrchr (char version) - Finds the last occurence of a
   /// character in a string.
   extern ACE_Export
   char *strrchr_emulation (char *s, int c);
 
-  /// Emulated strrchr (const char version) - Finds the last occurance of a
+  /// Emulated strrchr (const char version) - Finds the last occurence of a
   /// character in a string.
   extern ACE_Export
   const char *strrchr_emulation (const char *s, int c);
@@ -405,24 +405,24 @@ namespace ACE_OS {
   size_t strspn (const wchar_t *s1, const wchar_t *s2);
 #endif /* ACE_HAS_WCHAR */
 
-  /// Finds the first occurance of a substring in a string (const char
+  /// Finds the first occurence of a substring in a string (const char
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
   const char *strstr (const char *s, const char *t);
 
 #if defined (ACE_HAS_WCHAR)
-  /// Finds the first occurance of a substring in a string (const wchar_t
+  /// Finds the first occurence of a substring in a string (const wchar_t
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
   const wchar_t *strstr (const wchar_t *s, const wchar_t *t);
 #endif /* ACE_HAS_WCHAR */
 
-  /// Finds the first occurance of a substring in a string (char version).
+  /// Finds the first occurence of a substring in a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strstr (char *s, const char *t);
 
 #if defined (ACE_HAS_WCHAR)
-  /// Finds the first occurance of a substring in a string (wchar_t version).
+  /// Finds the first occurence of a substring in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *strstr (wchar_t *s, const wchar_t *t);
 #endif /* ACE_HAS_WCHAR */
diff --git a/ACE/ace/OS_NS_wchar.h b/ACE/ace/OS_NS_wchar.h
index 9cfa3b4bb65..614a19fc435 100644
--- a/ACE/ace/OS_NS_wchar.h
+++ b/ACE/ace/OS_NS_wchar.h
@@ -136,12 +136,12 @@ namespace ACE_OS
 #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSPBRK */
 
 #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSRCHR)
-  /// Emulated wcsrchr (wchar_t version) - Finds the last occurance of a
+  /// Emulated wcsrchr (wchar_t version) - Finds the last occurence of a
   /// character in a string.
   extern ACE_Export
   wchar_t *wcsrchr_emulation (wchar_t *string, wint_t c);
 
-  /// Emulated wcsrchr (const wchar_t version) - Finds the last occurance of a
+  /// Emulated wcsrchr (const wchar_t version) - Finds the last occurence of a
   /// character in a string.
   extern ACE_Export
   const wchar_t *wcsrchr_emulation (const wchar_t *string, wint_t c);