ChangeLogTag: Mon Jan 16 19:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 24 insertions, 45 deletions

diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 3c6297e0725..b9cf855b5c9 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -25,7 +25,7 @@
 
 #if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620)
 extern "C" int maxFiles;
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 #if !defined (__ACE_INLINE__)
 #include "ace/ACE.inl"
@@ -2659,7 +2659,7 @@ ACE::handle_timed_complete (ACE_HANDLE h,
       need_to_check = 1;
       known_failure = 1;
     }
-#elif defined (VXWORKS)
+#elif defined (ACE_VXWORKS)
   ACE_UNUSED_ARG (is_tli);
 
   // Force the check on VxWorks.  The read handle for "h" is not set,
diff --git a/ace/Flag_Manip.inl b/ace/Flag_Manip.inl
index 38739d62e2d..da24f2a1282 100644
--- a/ace/Flag_Manip.inl
+++ b/ace/Flag_Manip.inl
@@ -13,7 +13,7 @@ ACE::get_flags (ACE_HANDLE handle)
   ACE_TRACE ("ACE::get_flags");
 
 #if defined (ACE_LACKS_FCNTL)
-  // ACE_OS::fcntl is not supported, e.g., on VxWorks.  It
+  // ACE_OS::fcntl is not supported.  It
   // would be better to store ACE's notion of the flags
   // associated with the handle, but this works for now.
   ACE_UNUSED_ARG (handle);
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 0d109f3e907..d07ec78942d 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -322,7 +322,7 @@ ACE_INET_Addr::set (u_short port_number,
                       encode);
   else
     {
-#  if defined (VXWORKS) || defined (CHORUS)
+#  if defined (ACE_VXWORKS) || defined (CHORUS)
       hostent *hp = ACE_OS::gethostbyname (host_name);
 #  else
       hostent hentry;
diff --git a/ace/OS_NS_dlfcn.inl b/ace/OS_NS_dlfcn.inl
index ece6440b79c..01e4f254858 100644
--- a/ace/OS_NS_dlfcn.inl
+++ b/ace/OS_NS_dlfcn.inl
@@ -115,32 +115,23 @@ ACE_OS::dlerror (void)
 # endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */
 }
 
-# if defined (ACE_HAS_CHARPTR_DL)
-typedef ACE_TCHAR * ACE_DL_TYPE;
-# else
-typedef const ACE_TCHAR * ACE_DL_TYPE;
-# endif /* ACE_HAS_CHARPTR_DL */
-
 ACE_INLINE ACE_SHLIB_HANDLE
 ACE_OS::dlopen (const ACE_TCHAR *fname,
                 int mode)
 {
   ACE_OS_TRACE ("ACE_OS::dlopen");
 
-  // Get the correct OS type.
-  ACE_DL_TYPE filename = const_cast<ACE_DL_TYPE> (fname);
-
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
   void *handle;
 #   if defined (ACE_HAS_SGIDLADD)
   ACE_OSCALL
-    (::sgidladd (ACE_TEXT_ALWAYS_CHAR (filename), mode), void *, 0, handle);
+    (::sgidladd (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle);
 #   elif defined (_M_UNIX)
   ACE_OSCALL
-    (::_dlopen (ACE_TEXT_ALWAYS_CHAR (filename), mode), void *, 0, handle);
+    (::_dlopen (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle);
 #   else
   ACE_OSCALL
-    (::dlopen (ACE_TEXT_ALWAYS_CHAR (filename), mode), void *, 0, handle);
+    (::dlopen (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle);
 #   endif /* ACE_HAS_SGIDLADD */
 #   if !defined (ACE_HAS_AUTOMATIC_INIT_FINI)
   if (handle != 0)
@@ -163,18 +154,18 @@ ACE_OS::dlopen (const ACE_TCHAR *fname,
 # elif defined (ACE_WIN32)
   ACE_UNUSED_ARG (mode);
 
-  ACE_WIN32CALL_RETURN (ACE_TEXT_LoadLibrary (filename), ACE_SHLIB_HANDLE, 0);
+  ACE_WIN32CALL_RETURN (ACE_TEXT_LoadLibrary (fname), ACE_SHLIB_HANDLE, 0);
 # elif defined (__hpux)
 
 #   if defined(__GNUC__) || __cplusplus >= 199707L
-  ACE_OSCALL_RETURN (::shl_load(filename, mode, 0L), ACE_SHLIB_HANDLE, 0);
+  ACE_OSCALL_RETURN (::shl_load(fname, mode, 0L), ACE_SHLIB_HANDLE, 0);
 #   else
-  ACE_OSCALL_RETURN (::cxxshl_load(filename, mode, 0L), ACE_SHLIB_HANDLE, 0);
+  ACE_OSCALL_RETURN (::cxxshl_load(fname, mode, 0L), ACE_SHLIB_HANDLE, 0);
 #   endif  /* aC++ vs. Hp C++ */
 # elif defined (VXWORKS)
-  MODULE* handle;
+  MODULE* handle = 0;
   // Open readonly
-  ACE_HANDLE filehandle = ACE_OS::open (filename,
+  ACE_HANDLE filehandle = ACE_OS::open (fname,
                                         O_RDONLY,
                                         ACE_DEFAULT_FILE_PERMS);
 
@@ -188,8 +179,8 @@ ACE_OS::dlopen (const ACE_TCHAR *fname,
       if ( (loaderror != 0) && (handle != 0) )
         {
           // ouch something went wrong most likely unresolved externals
-                  if (handle)
-                ::unldByModuleId ( handle, 0 );
+          if (handle)
+            ::unldByModuleId ( handle, 0 );
           handle = 0;
         }
     }
@@ -233,8 +224,6 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
   // WinCE is WCHAR always; other platforms need a char * symbol name
   ACE_Wide_To_Ascii w_sname (sname);
   char *symbolname = w_sname.char_rep ();
-#elif defined (ACE_HAS_CHARPTR_DL)
-  char *symbolname = const_cast<char *> (sname);
 #else
   const char *symbolname = sname;
 #endif /* ACE_HAS_WINCE */
diff --git a/ace/OS_NS_netdb.cpp b/ace/OS_NS_netdb.cpp
index 41073340e1a..1cb0b73908a 100644
--- a/ace/OS_NS_netdb.cpp
+++ b/ace/OS_NS_netdb.cpp
@@ -19,7 +19,7 @@ ACE_RCSID(ace, OS_NS_netdb, "$Id$")
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
 
 struct hostent *
 ACE_OS::gethostbyaddr (const char *addr, int length, int type)
@@ -185,7 +185,7 @@ ACE_OS::gethostbyname_r (const char *name, hostent *result,
   return result;
 }
 
-#endif /* VXWORKS */
+#endif /* ACE_VXWORKS */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/ace/Reactor.h b/ace/Reactor.h
index 58589f4b62f..5e2fd54fead 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -213,9 +213,9 @@ public:
   virtual void reset_reactor_event_loop (void);
 
   /**
-   * Create the Reactor using <implementation>.  The flag
-   * <delete_implementation> tells the Reactor whether or not to
-   * delete the <implementation> on destruction.
+   * Create the Reactor using @a implementation.  The flag
+   * @a delete_implementation tells the Reactor whether or not to
+   * delete the @a implementation on destruction.
    */
   ACE_Reactor (ACE_Reactor_Impl *implementation = 0,
                int delete_implementation = 0);
diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h
index 74ad7d93ff9..11176ef34df 100644
--- a/ace/Read_Buffer.h
+++ b/ace/Read_Buffer.h
@@ -82,7 +82,7 @@ public:
   size_t replaced (void) const;
 
   /// Returns the size of the allocated buffer obtained during a
-  /// <read>, not including the null terminator.
+  /// @c read, not including the null terminator.
   size_t size (void) const;
 
   /// Returns a pointer to its allocator.
diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp
index 2870a9e4d86..bf70db6d1ee 100644
--- a/ace/SOCK_IO.cpp
+++ b/ace/SOCK_IO.cpp
@@ -68,7 +68,7 @@ ACE_SOCK_IO::recvv (iovec *io_vec,
       break;
     }
 
-  u_long inlen;
+  int inlen = 0;
 
   if (ACE_OS::ioctl (this->get_handle (),
                      FIONREAD,
diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h
index 7c1af2b226a..7911719f7d7 100644
--- a/ace/SV_Semaphore_Complex.h
+++ b/ace/SV_Semaphore_Complex.h
@@ -131,8 +131,8 @@ public:
   int control (int cmd, int value = 0, u_short n = 0) const;
 
   // = Upgrade access control...
-  ACE_USING ACE_SV_Semaphore_Simple::get_id;
-  ACE_USING ACE_SV_Semaphore_Simple::remove;
+  using ACE_SV_Semaphore_Simple::get_id;
+  using ACE_SV_Semaphore_Simple::remove;
 
   /// Dump the state of an object.
   void dump (void) const;
diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp
index 5a40f7de199..e6395c148a3 100644
--- a/ace/Sched_Params.cpp
+++ b/ace/Sched_Params.cpp
@@ -129,7 +129,7 @@ ACE_Sched_Params::priority_min (const Policy policy,
   ACE_UNUSED_ARG (policy);
   ACE_UNUSED_ARG (scope);
   return THREAD_PRIORITY_IDLE;
-#elif defined (VXWORKS)
+#elif defined (ACE_VXWORKS)
   ACE_UNUSED_ARG (policy);
   ACE_UNUSED_ARG (scope);
   return 255;
diff --git a/ace/config-all.h b/ace/config-all.h
index cd6ba222a7f..9c0f3bf6efc 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -23,16 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-# if defined (VXWORKS)
-#   if defined (ghs)
-    // GreenHills 1.8.8 needs the stdarg.h #include before the #include of
-    // vxWorks.h.
-    // Also, be sure that these #includes come _after_ the key_t typedef, and
-    // before the #include of time.h.
-#     include "ace/os_include/os_stdarg.h"
-#   endif /* ghs */
-# endif /* VXWORKS */
-
 // This is used to indicate that a platform doesn't support a
 // particular feature.
 #if defined ACE_HAS_VERBOSE_NOTSUP