ChangeLogTag: Fri Aug 6 08:40:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 75 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index f27c473aa57..2dcb4b412b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Fri Aug  6 08:34:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
+
+        * ace/config-win32-msvc-7.h:
+        * ace/config-win32-msvc-8.h:
+          Added ACE_HAS_TEMPLATE_TYPEDEFS
+
+        * ace/config-win32-visualage.h:
+          Added huge list of new defines
+
+        * ace/Event_Handler_T.h:
+          Instead of -1 use ACE_INVALID_HANDLE to make it portable
+
+        * ace/Malloc.cpp:
+          Corrected assert
+
+        * ace/OS_NS_sys_stat.h:
+          For IBMCPP also define ACE_stat as stat
+
+        * ace/OS_NS_sys_stat.inl (stat):
+          For Visual Age use special _stat call
+
+        * ace/Task.cpp (svc_run):
+          For Visual Age also do a static cast
+
+          Thanks to Boris Kaminer <boris_kaminer@mail.ru> for reporting
+          this.
+
 Fri Aug  6 08:03:12 UTC 2004  Johnny Willemsen  <jwillemen@remedy.nl>
 
         * ace/config-win32-msvc-8.h:
diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h
index 4f2d10f3df8..1352a65d486 100644
--- a/ace/Event_Handler_T.h
+++ b/ace/Event_Handler_T.h
@@ -100,9 +100,9 @@ public:
   // These methods all delegate down to the <T> operations handler.
   virtual ACE_HANDLE get_handle (void) const;
   virtual void set_handle (ACE_HANDLE);
-  virtual int handle_input (ACE_HANDLE fd = -1);
-  virtual int handle_output (ACE_HANDLE fd = -1);
-  virtual int handle_exception (ACE_HANDLE fd = -1);
+  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
+  virtual int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE);
+  virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE);
   virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0);
   virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask);
   virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index b0ff605f368..9985ec74849 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -138,7 +138,7 @@ void
 ACE_Control_Block::ACE_Name_Node::name (const char *)
 {
 #if !defined (ACE_PSOS)
-  ACE_ASSERT (0 == "not implemented!");
+  ACE_ASSERT (!"not implemented!");
 #endif /* ! ACE_PSOS */
 }
 
diff --git a/ace/OS_NS_sys_stat.h b/ace/OS_NS_sys_stat.h
index 6f82c1930d7..670de445470 100644
--- a/ace/OS_NS_sys_stat.h
+++ b/ace/OS_NS_sys_stat.h
@@ -34,7 +34,7 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__)
+# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__) && !defined(__IBMCPP__)
       typedef struct _stat ACE_stat;
 # else
       typedef struct stat ACE_stat;
diff --git a/ace/OS_NS_sys_stat.inl b/ace/OS_NS_sys_stat.inl
index 8f17ae48465..19e06b7715b 100644
--- a/ace/OS_NS_sys_stat.inl
+++ b/ace/OS_NS_sys_stat.inl
@@ -285,7 +285,11 @@ ACE_OS::stat (const char *file, ACE_stat *stp)
    // wrapper for _xstat().
   ACE_OSCALL_RETURN (::_xstat (_STAT_VER, file, stp), int, -1);
 #elif defined (ACE_WIN32)
+# if defined(__IBMCPP__)
+  ACE_OSCALL_RETURN (::_stat (file,  stp), int, -1);
+#else
   ACE_OSCALL_RETURN (::_stat (file, (struct _stat *) stp), int, -1);
+#endif /* __IBMCPP__ */
 #else /* VXWORKS */
   ACE_OSCALL_RETURN (::stat (file, stp), int, -1);
 #endif /* VXWORKS */
diff --git a/ace/Task.cpp b/ace/Task.cpp
index a5a51d0da93..3b508229acd 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -202,12 +202,12 @@ ACE_Task_Base::svc_run (void *args)
   // Call the Task's svc() hook method.
   int svc_status = t->svc ();
   ACE_THR_FUNC_RETURN status;
-#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x570)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1400))
+#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x570)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1400)) || (defined(__IBMCPP__))
   // Some compilers complain about reinterpret_cast from int to unsigned long...
   status = static_cast<ACE_THR_FUNC_RETURN> (svc_status);
 #else
   status = reinterpret_cast<ACE_THR_FUNC_RETURN> (svc_status);
-#endif /* (__BORLANDC__ < 0x570) || __MINGW32__ || _MSC_VER <= 1400 */
+#endif /* (__BORLANDC__ < 0x570) || __MINGW32__ || _MSC_VER <= 1400 || __IBMCPP__ */
 
 // If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke
 #if 1
diff --git a/ace/config-win32-msvc-7.h b/ace/config-win32-msvc-7.h
index edde4e820a2..f3f47bfd8f7 100644
--- a/ace/config-win32-msvc-7.h
+++ b/ace/config-win32-msvc-7.h
@@ -70,6 +70,7 @@
 #define ACE_LACKS_STRRECVFD
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
+#define ACE_HAS_TEMPLATE_TYPEDEFS
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
diff --git a/ace/config-win32-msvc-8.h b/ace/config-win32-msvc-8.h
index a3b0991ded2..e99ad109bf6 100644
--- a/ace/config-win32-msvc-8.h
+++ b/ace/config-win32-msvc-8.h
@@ -70,6 +70,7 @@
 #define ACE_LACKS_STRRECVFD
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
+#define ACE_HAS_TEMPLATE_TYPEDEFS
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h
index 6b14c88c866..9aa661aa45d 100644
--- a/ace/config-win32-visualage.h
+++ b/ace/config-win32-visualage.h
@@ -74,9 +74,44 @@
 #define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 
+#define ACE_LACKS_NET_IF_H
+#define ACE_LACKS_NETINET_IN_H
+#define ACE_LACKS_DIRENT_H
+#define ACE_LACKS_DLFCN_H
+#define ACE_LACKS_NETDB_H
+#define ACE_LACKS_PWD_H
+#define ACE_LACKS_SEMAPHORE_H
+#define ACE_LACKS_STDINT_H
+#define ACE_LACKS_STRINGS_H
+#define ACE_LACKS_SYS_IOCTL_H
+#define ACE_LACKS_STROPTS_H
+#define ACE_LACKS_UCONTEXT_H
+#define ACE_LACKS_SYS_IPC_H
+#define ACE_LACKS_SYS_MMAN_H
+#define ACE_LACKS_SYS_RESOURCE_H
+#define ACE_LACKS_SYS_SELECT_H
+#define ACE_LACKS_SYS_SEM_H
+#define ACE_LACKS_SYS_SOCKET_H
+#define ACE_LACKS_SYS_TIME_H
+#define ACE_LACKS_SYS_UIO_H
+#define ACE_LACKS_SYS_WAIT_H
+#define ACE_LACKS_SYS_SHM_H
+#define ACE_LACKS_SYS_MSG_H
+#define ACE_LACKS_TERMIOS_H
+#define ACE_LACKS_POLL_H
+#define ACE_LACKS_NETINET_TCP_H
+#define ACE_HAS_3_PARAM_WCSTOK
+#define ACE_LACKS_STRCASECMP
+#define ENOTEMPTY     WSAENOTEMPTY
+#define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
+
 #undef WIFEXITED
 #undef WEXITSTATUS
 
+#define _O_CREAT  O_CREAT
+#define _O_TRUNC   O_TRUNC
+#define _O_TEMPORARY   0
+#define _O_EXCL   O_EXCL
 #define _O_RDWR   O_RDWR
 #define _O_WRONLY O_WRONLY
 #define _O_RDONLY O_RDONLY