summaryrefslogtreecommitdiff
path: root/ACE/ace/config-linux.h
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2013-08-09 17:47:05 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2013-08-09 17:47:05 +0000
commit1d10e0dee68f68808c7223e9c4a9dcc05d13a062 (patch)
treef61f1876306a85bb1956913fdca38d8a859d119a /ACE/ace/config-linux.h
parent590842fd8d06bf12ff923416bedc38016e442292 (diff)
downloadATCD-1d10e0dee68f68808c7223e9c4a9dcc05d13a062.tar.gz
Fri Aug 9 17:46:31 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-linux.h: Use C++ casts instead of C-style casts for ACE_DEFAULT_BASE_ADDR. This fixes bugzilla 4113, thanks to Yogesh Sharma <Yogesh dot Sharma at saabsensis dot com> for reporting this and supplying the patch
Diffstat (limited to 'ACE/ace/config-linux.h')
-rw-r--r--ACE/ace/config-linux.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index 641ac9b2541..014ad53e23f 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -72,13 +72,13 @@
#if defined (__powerpc__) || defined (__x86_64__)
# if !defined (ACE_DEFAULT_BASE_ADDR)
-# define ACE_DEFAULT_BASE_ADDR ((char *) 0x40000000)
+# define ACE_DEFAULT_BASE_ADDR (reinterpret_cast< char* >(0x40000000))
# endif /* ! ACE_DEFAULT_BASE_ADDR */
#elif defined (__ia64)
# if !defined (ACE_DEFAULT_BASE_ADDR)
// Zero base address should work fine for Linux of IA-64: it just lets
// the kernel to choose the right value.
-# define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000000000000000)
+# define ACE_DEFAULT_BASE_ADDR (reinterpret_cast< char*>(0x0000000000000000))
# endif /* ! ACE_DEFAULT_BASE_ADDR */
#endif /* ! __powerpc__ && ! __ia64 */
@@ -203,7 +203,7 @@
#define ACE_HAS_3_PARAM_READDIR_R
#if !defined (ACE_DEFAULT_BASE_ADDR)
-# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
+# define ACE_DEFAULT_BASE_ADDR (reinterpret_cast< char* >(0x80000000))
#endif /* ! ACE_DEFAULT_BASE_ADDR */
#define ACE_HAS_ALLOCA