ChangeLogTag: Thu Nov 5 07:46:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 35 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 6247da1ee29..9014c1cf2f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Thu Nov  6 07:46:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Nov  5 07:46:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ARGV.h:
           Define a private copy constructor and assignment operator. The
diff --git a/ace/ARGV.h b/ace/ARGV.h
index 6eb0048f395..9533a0b7368 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -107,10 +107,10 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
   /// Add another argument.  This only works in the <ITERATIVE> state.
-  /// Note that this method does not copy <next_arg>, nor does it 
+  /// Note that this method does not copy <next_arg>, nor does it
   /// assume ownership of managing its memory, i.e., the caller is
   /// responsible for memory management.  Returns -1 on failure and 0
-  /// on success.  
+  /// on success.
   int add (const ACE_TCHAR *next_arg);
 
   /**
@@ -135,6 +135,11 @@ public:
   };
 
 private:
+  /// Copy Constructor not implemented
+  ACE_ARGV (const ACE_ARGV&);
+
+  /// Assignment '=' operator not implemented
+  ACE_ARGV operator= (const ACE_ARGV&);
 
   /// Creates buf_ from the queue, deletes previous buf_.
   int create_buf_from_queue (void);
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index 6e1cfa51eaf..60f343f0cad 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -5,7 +5,6 @@
 #define ACE_CONNECTOR_C
 
 #include "ace/Connector.h"
-#include "ace/Handle_Set.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Connector.h b/ace/Connector.h
index 55701369f98..b6ca3632d66 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -23,6 +23,7 @@
 
 #include "ace/Strategies_T.h"
 #include "ace/Synch_Options.h"
+#include "ace/Handle_Set.h"
 
 /**
  * @class ACE_Connector_Base
diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl
index e11ce4a9440..caeb841a093 100644
--- a/ace/OS_NS_stdio.inl
+++ b/ace/OS_NS_stdio.inl
@@ -622,7 +622,7 @@ ACE_INLINE int
 ACE_OS::fclose (FILE *fp)
 {
   ACE_OS_TRACE ("ACE_OS::fclose");
-  ACE_OSCALL_RETURN (::fclose (fp), int, -1);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fclose (fp), int, -1);
 }
 
 ACE_INLINE FILE *
@@ -688,19 +688,19 @@ ACE_OS::fflush (FILE *fp)
     }
 #endif /* VXWORKS */
 
-  ACE_OSCALL_RETURN (::fflush (fp), int, -1);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fflush (fp), int, -1);
 }
 
 ACE_INLINE int
 ACE_OS::fgetc (FILE* fp)
 {
-  ACE_OSCALL_RETURN (::fgetc (fp), int, -1);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetc (fp), int, -1);
 }
 
 ACE_INLINE int
 ACE_OS::fgetpos (FILE* fp, fpos_t* pos)
 {
-  ACE_OSCALL_RETURN (::fgetpos (fp, pos), int, -1);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetpos (fp, pos), int, -1);
 }
 
 ACE_INLINE ACE_TCHAR *
@@ -710,7 +710,7 @@ ACE_OS::fgets (ACE_TCHAR *buf, int size, FILE *fp)
 #if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
   ACE_OSCALL_RETURN (::fgetws (buf, size, fp), wchar_t *, 0);
 #else /* ACE_WIN32 */
-  ACE_OSCALL_RETURN (::fgets (buf, size, fp), char *, 0);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgets (buf, size, fp), char *, 0);
 #endif /* ACE_WIN32 && ACE_USES_WCHAR */
 }
 
@@ -732,7 +732,7 @@ ACE_OS::fputs (const ACE_TCHAR *s, FILE *stream)
 #if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
   ACE_OSCALL_RETURN (::fputws (s, stream), int, -1);
 #else /* ACE_WIN32 */
-  ACE_OSCALL_RETURN (::fputs (s, stream), int, -1);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputs (s, stream), int, -1);
 #endif /* ACE_WIN32 && ACE_USES_WCHAR */
 }
 
@@ -743,7 +743,7 @@ ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp)
 #if defined (ACE_LACKS_POSIX_PROTOTYPES)
   ACE_OSCALL_RETURN (::fread ((char *) ptr, size, nelems, fp), int, 0);
 #else
-  ACE_OSCALL_RETURN (::fread (ptr, size, nelems, fp), int, 0);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fread (ptr, size, nelems, fp), int, 0);
 #endif /* ACE_LACKS_POSIX_PROTOTYPES */
 }
 
@@ -754,7 +754,7 @@ ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream)
 #if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
   ACE_OSCALL_RETURN (::_wfreopen (filename, mode, stream), FILE *, 0);
 #else
-  ACE_OSCALL_RETURN (::freopen (filename, mode, stream), FILE *, 0);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::freopen (filename, mode, stream), FILE *, 0);
 #endif /* ACE_WIN32 && ACE_USES_WCHAR */
 }
 
@@ -781,7 +781,7 @@ ACE_OS::fseek (FILE *fp, long offset, int whence)
     }
 #   endif  /* SEEK_SET != FILE_BEGIN || SEEK_CUR != FILE_CURRENT || SEEK_END != FILE_END */
 # endif   /* ACE_WIN32 */
-  ACE_OSCALL_RETURN (::fseek (fp, offset, whence), int, -1);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fseek (fp, offset, whence), int, -1);
 }
 
 ACE_INLINE int
@@ -793,7 +793,7 @@ ACE_OS::fsetpos (FILE* fp, fpos_t* pos)
 ACE_INLINE long
 ACE_OS::ftell (FILE* fp)
 {
-  ACE_OSCALL_RETURN (::ftell (fp), long, -1);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ftell (fp), long, -1);
 }
 
 ACE_INLINE size_t
@@ -803,7 +803,7 @@ ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp)
 #if defined (ACE_LACKS_POSIX_PROTOTYPES)
   ACE_OSCALL_RETURN (::fwrite ((const char *) ptr, size, nitems, fp), int, 0);
 #else
-  ACE_OSCALL_RETURN (::fwrite (ptr, size, nitems, fp), int, 0);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fwrite (ptr, size, nitems, fp), int, 0);
 #endif /* ACE_LACKS_POSIX_PROTOTYPES */
 }
 
diff --git a/ace/OS_NS_time.cpp b/ace/OS_NS_time.cpp
index 50d8d686759..0147cc842d3 100644
--- a/ace/OS_NS_time.cpp
+++ b/ace/OS_NS_time.cpp
@@ -485,7 +485,7 @@ ACE_OS::mktime (struct tm *t)
   ACE_OS_GUARD
 #     endif /* ACE_HAS_THREADS  &&  ! ACE_HAS_MT_SAFE_MKTIME */
 
-  ACE_OSCALL_RETURN (::mktime (t), time_t, (time_t) -1);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::mktime (t), time_t, (time_t) -1);
 #   endif /* ACE_PSOS && ! ACE_PSOS_HAS_TIME */
 }
 
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index 2ebe521bb4a..abd7d56b84e 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -12,7 +12,7 @@ ACE_OS::asctime (const struct tm *t)
 {
 #if !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
   ACE_OS_TRACE ("ACE_OS::asctime");
-  ACE_OSCALL_RETURN (::asctime (t), char *, 0);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::asctime (t), char *, 0);
 #else
   // @@ WinCE doesn't have gmtime also.
   ACE_UNUSED_ARG (t);
@@ -43,7 +43,7 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen)
 # endif /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */
 #elif ! defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
   char *result;
-  ACE_OSCALL (::asctime (t), char *, 0, result);
+  ACE_OSCALL (ACE_STD_NAMESPACE::asctime (t), char *, 0, result);
   ACE_OS::strsncpy (buf, result, buflen);
   return buf;
 #else
@@ -425,7 +425,7 @@ ACE_OS::strftime (char *s, size_t maxsize, const char *format,
                   const struct tm *timeptr)
 {
 #if !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
-  return ::strftime (s, maxsize, format, timeptr);
+  return ACE_STD_NAMESPACE::strftime (s, maxsize, format, timeptr);
 #else
   ACE_UNUSED_ARG (s);
   ACE_UNUSED_ARG (maxsize);
diff --git a/ace/OS_NS_wchar.inl b/ace/OS_NS_wchar.inl
index 26caa1a43d0..c5413950ab4 100644
--- a/ace/OS_NS_wchar.inl
+++ b/ace/OS_NS_wchar.inl
@@ -9,7 +9,7 @@ ACE_OS::fgetwc (FILE* fp)
   ACE_UNUSED_ARG (fp);
   ACE_NOTSUP_RETURN (0);
 #else
-  ACE_OSCALL_RETURN (::fgetwc (fp), wint_t, WEOF);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetwc (fp), wint_t, WEOF);
 #endif /* ACE_LACKS_FGETWC */
 }
 #endif /* ACE_HAS_WCHAR */
@@ -76,7 +76,7 @@ ACE_OS::ungetwc (wint_t c, FILE* fp)
   ACE_UNUSED_ARG (fp);
   ACE_NOTSUP_RETURN (0);
 #else
-  ACE_OSCALL_RETURN (::ungetwc (c, fp), wint_t, WEOF);
+  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ungetwc (c, fp), wint_t, WEOF);
 #endif /* ACE_LACKS_FGETWC */
 }
 #endif /* ACE_HAS_WCHAR */
diff --git a/ace/config-all.h b/ace/config-all.h
index 9fb4c729856..a6a3a077d29 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -705,6 +705,12 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \
 # define ACE_NOTSUP do { errno = ENOTSUP; return; } while (0)
 #endif /* ! ACE_HAS_VERBOSE_NOTSUP */
 
+#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB == 1)
+#  define ACE_STD_NAMESPACE std
+#else
+#  define ACE_STD_NAMESPACE
+#endif
+
 // empty ACE_OS namespace to help identify compiler errors more easily.
 namespace ACE_OS {}
 #if !defined (ACE_OS_String)
diff --git a/ace/config-win32.h b/ace/config-win32.h
index e0bfb1e1a35..a7a46c39fa1 100644
--- a/ace/config-win32.h
+++ b/ace/config-win32.h
@@ -37,11 +37,10 @@
 #endif /* !__BORLANDC__ */
 
 // Include the config-win32-* file specific to the compiler
-
-#if defined (_MSC_VER)
-#    include "ace/config-win32-msvc.h"
-#elif defined (__BORLANDC__)
+#if defined (__BORLANDC__)
 #    include "ace/config-win32-borland.h"
+#elif defined (_MSC_VER)
+#    include "ace/config-win32-msvc.h"
 #elif defined (__IBMCPP__)
 #    include "ace/config-win32-visualage.h"
 #elif defined (ghs)