summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/ace/OS_NS_stdlib.inl12
2 files changed, 18 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index eaa2abfc40a..46fc236d4b0 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 01 09:05:10 UTC 2006 Martin Corino <mcorino@remedy.nl>
+
+ * ace/OS_NS_stdlib.inl:
+
+ Fixed conversion warnings in atop() on OpenVMS.
+
Wed Nov 01 08:35:10 UTC 2006 Martin Corino <mcorino@remedy.nl>
* ace/OS_NS_sys_stat.h:
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl
index 4604b5d2005..3099a5e2c70 100644
--- a/ACE/ace/OS_NS_stdlib.inl
+++ b/ACE/ace/OS_NS_stdlib.inl
@@ -79,6 +79,12 @@ ACE_OS::atop (const char *s)
ACE_TRACE ("ACE_OS::atop");
#if defined (ACE_WIN64)
intptr_t ip = ::_atoi64 (s);
+#elif defined (ACE_OPENVMS)
+# if !defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)
+ int ip = ::atoi (s);
+# else
+ intptr_t ip = ::atoi (s);
+# endif
#else
intptr_t ip = ::atoi (s);
#endif /* ACE_WIN64 */
@@ -92,6 +98,12 @@ ACE_OS::atop (const wchar_t *s)
{
# if defined (ACE_WIN64)
intptr_t ip = ::_wtoi64 (s);
+# elif defined (ACE_OPENVMS)
+# if !defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)
+ int ip = ACE_OS::atoi (s);
+# else
+ intptr_t ip = ACE_OS::atoi (s);
+# endif
# else
intptr_t ip = ACE_OS::atoi (s);
# endif /* ACE_WIN64 */