ChangeLogTag: Thu Sep 23 19:53:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 31 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index abe050d0f53..dd2cb1f9a5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Sep 23 19:53:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/streams.h:
+          Removed explicit check of _MSC_VER >= 1200, just check for _MSC_VER,
+          version 1200 is msvc6, the oldest msvc compiler we support, this
+          compiler and newer have pragma warning push/pop
+
 Thu Sep 23 12:07:02 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* ace/ACE.cpp:
diff --git a/ace/OS_NS_stdio.cpp b/ace/OS_NS_stdio.cpp
index 10208d96a34..ba0db48f506 100644
--- a/ace/OS_NS_stdio.cpp
+++ b/ace/OS_NS_stdio.cpp
@@ -146,7 +146,7 @@ ACE_OS::fopen (const char *filename,
 #   endif  // ACE_USES_WCHAR
             return fp;
           }
-          _close (fd);
+          ::_close (fd);
         }
 # endif  // ACE_HAS_WINCE
 
@@ -201,7 +201,7 @@ ACE_OS::fopen (const wchar_t *filename,
 #   endif  // ACE_USES_WCHAR
             return fp;
           }
-          _close (fd);
+          ::_close (fd);
         }
 # endif  // ACE_HAS_WINCE
 
@@ -399,7 +399,7 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...)
 {
   ACE_OS_TRACE ("ACE_OS::sprintf");
 
-# if (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) || (defined ACE_HAS_DINKUM_STL)
+# if (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) || (defined ACE_HAS_DINKUM_STL) || defined (__DMC__)
 
   // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a
   // maxlen argument. Since this method doesn't supply one, pass in
diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl
index 0d1459b64f7..2b945208ac0 100644
--- a/ace/OS_NS_stdio.inl
+++ b/ace/OS_NS_stdio.inl
@@ -983,7 +983,7 @@ ACE_OS::tempnam (const char *dir, const char *pfx)
   // pSOS only considers the directory prefix
   ACE_UNUSED_ARG (pfx);
   ACE_OSCALL_RETURN (::tmpnam ((char *) dir), char *, 0);
-#elif (defined (ACE_WIN32) && ((defined (__BORLANDC__) && (__BORLANDC__ < 0x600))))
+#elif (defined (ACE_WIN32) && ((defined (__BORLANDC__) && (__BORLANDC__ < 0x600)) || defined (__DMC__)))
   ACE_OSCALL_RETURN (::_tempnam ((char *) dir, (char *) pfx), char *, 0);
 #else /* ACE_HAS_WINCE || ACE_LACKS_TEMPNAM */
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (dir, pfx), char *, 0);
@@ -1000,7 +1000,7 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx)
   ACE_UNUSED_ARG (pfx);
   ACE_NOTSUP_RETURN (0);
 #elif defined(ACE_WIN32)
-#  if defined (__BORLANDC__) && (__BORLANDC__ < 0x600)
+#  if (defined (__BORLANDC__) && (__BORLANDC__ < 0x600)) || defined (__DMC__)
   ACE_OSCALL_RETURN (::_wtempnam ((wchar_t*) dir, (wchar_t*) pfx), wchar_t *, 0);
 #  else
   ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0);
@@ -1039,7 +1039,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
 {
 # if (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) || \
      (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \
-     (defined (ACE_HAS_DINKUM_STL))
+     (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__))
 
   // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a
   // maxlen argument. Since this method doesn't supply one, pass in
diff --git a/ace/Service_Manager.h b/ace/Service_Manager.h
index f2805abe74a..6c7d745e65e 100644
--- a/ace/Service_Manager.h
+++ b/ace/Service_Manager.h
@@ -61,7 +61,7 @@ protected:
   // = Perform the various meta-services.
 
   /// Trigger a reconfiguration of the Service Configurator by
-  //re-reading its local <svc.conf> file.
+  /// re-reading its local <svc.conf> file.
   virtual int reconfigure_services (void);
 
   /// Determine all the services offered by this daemon and return the
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index b44fddf9d66..6cf4379cced 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -60,7 +60,7 @@ class ACE_Service_Type_Impl;
  * @class ACE_Service_Type
  *
  * @brief Keeps track of information related to the various
- * <ACE_Service_Type_Impl> subclasses.
+ * ACE_Service_Type_Impl subclasses.
  *
  * This class acts as the interface of the "Bridge" pattern.
  */
diff --git a/ace/Service_Types.h b/ace/Service_Types.h
index ef489e851fa..a87169c7dbb 100644
--- a/ace/Service_Types.h
+++ b/ace/Service_Types.h
@@ -85,7 +85,7 @@ protected:
  * @class ACE_Service_Object_Type
  *
  * @brief Define the methods for handling the configuration of
- * <ACE_Service_Objects>.
+ * ACE_Service_Objects.
  */
 class ACE_Export ACE_Service_Object_Type : public ACE_Service_Type_Impl
 {
@@ -110,7 +110,7 @@ public:
  * @class ACE_Module_Type
  *
  * @brief Define the methods for handling the configuration of
- * <ACE_Modules>.
+ * ACE_Modules.
  */
 class ACE_Export ACE_Module_Type : public ACE_Service_Type_Impl
 {
@@ -129,10 +129,10 @@ public:
   virtual int fini (void) const;
   virtual int info (ACE_TCHAR **str, size_t len) const;
 
-  // Get the link pointer.
+  /// Get the link pointer.
   ACE_Module_Type *link (void) const;
 
-  // Set the link pointer.
+  /// Set the link pointer.
   void link (ACE_Module_Type *);
 
   /// Dump the state of an object.
@@ -142,7 +142,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-  /// Pointer to the next <ACE_Module_Type> in an <ACE_Stream_Type>.
+  /// Pointer to the next ACE_Module_Type in an ACE_Stream_Type.
   ACE_Module_Type *link_;
 };
 
@@ -150,7 +150,7 @@ private:
  * @class ACE_Stream_Type
  *
  * @brief Define the methods for handling the configuration of
- * <ACE_Streams>.
+ * ACE_Streams.
  */
 class ACE_Export ACE_Stream_Type : public ACE_Service_Type_Impl
 {
@@ -169,13 +169,13 @@ public:
   virtual int fini (void) const;
   virtual int info (ACE_TCHAR **str, size_t len) const;
 
-  /// Add a new <ACE_Module> to the top of the <ACE_Stream>.
+  /// Add a new  ACE_Module to the top of the ACE_Stream.
   int push (ACE_Module_Type *new_module);
 
-  /// Search for <module> and remove it from the <ACE_Stream>.
+  /// Search for @a module and remove it from the ACE_Stream.
   int remove (ACE_Module_Type *module);
 
-  /// Locate the <ACE_Module> with <mod_name>.
+  /// Locate the ACE_Module with @a mod_name.
   ACE_Module_Type *find (const ACE_TCHAR *mod_name) const;
 
   /// Dump the state of an object.
@@ -185,7 +185,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-  /// Pointer to the head of the <ACE_Module> list.
+  /// Pointer to the head of the ACE_Module list.
   ACE_Module_Type *head_;
 };
 
diff --git a/ace/Signal.h b/ace/Signal.h
index 3cefd3ce112..65007462034 100644
--- a/ace/Signal.h
+++ b/ace/Signal.h
@@ -43,15 +43,15 @@ class ACE_Export ACE_Sig_Set
 {
 public:
   // = Initialization and termination methods.
-  /// Initialize <sigset_> with <sigset>.  If <sigset> == 0 then fill
+  /// Initialize <sigset_> with @a sigset.  If @a sigset == 0 then fill
   /// the set.
   ACE_Sig_Set (sigset_t *sigset);
 
-  /// Initialize <sigset_> with <sigset>.  If <sigset> == 0 then fill
+  /// Initialize <sigset_> with @a sigset.  If @a sigset == 0 then fill
   /// the set.
   ACE_Sig_Set (ACE_Sig_Set *sigset);
 
-  /// If <fill> == 0 then initialize the <sigset_> to be empty, else
+  /// If @a fill == 0 then initialize the <sigset_> to be empty, else
   /// full.
   ACE_Sig_Set (int fill = 0);
 
diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h
index dcf0cc2d089..064b33753c8 100644
--- a/ace/Stream_Modules.h
+++ b/ace/Stream_Modules.h
@@ -24,7 +24,7 @@
 /**
  * @class ACE_Stream_Head
  *
- * @brief Standard module that acts as the head of a ustream.
+ * @brief Standard module that acts as the head of a stream.
  */
 template <ACE_SYNCH_DECL>
 class ACE_Stream_Head : public ACE_Task<ACE_SYNCH_USE>
@@ -62,7 +62,7 @@ private:
 /**
  * @class ACE_Stream_Tail
  *
- * @brief Standard module that acts as the head of a ustream.
+ * @brief Standard module that acts as the head of a stream.
  */
 template <ACE_SYNCH_DECL>
 class ACE_Stream_Tail : public ACE_Task<ACE_SYNCH_USE>
diff --git a/ace/Thread.inl b/ace/Thread.inl
index f12145ff040..a858535e1b1 100644
--- a/ace/Thread.inl
+++ b/ace/Thread.inl
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-// Thread.i
+// Thread.inl
 
 #include "ace/OS_NS_string.h"