summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2007-03-03 05:16:28 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2007-03-03 05:16:28 +0000
commit5c0592308496cf83148ff63451f7bb2c0bf5ee45 (patch)
treedf76841aae94d7c57168b8ad4f842cc1be19b6b5
parent4e7d39b6c3505366a53284abe912a8c094d8b0f5 (diff)
downloadATCD-5c0592308496cf83148ff63451f7bb2c0bf5ee45.tar.gz
ChangeLogTag:Fri Mar 3 5:01:19 UTC 2007 Ossama Othman <ossama_othman at symantec dot com>
-rw-r--r--ACE/ChangeLog10
-rw-r--r--ACE/ace/Basic_Types.h6
2 files changed, 14 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index dfd25230a4a..bb3888f3272 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,13 @@
+Fri Mar 3 5:01:19 UTC 2007 Ossama Othman <ossama_othman at symantec dot com>
+
+ * ace/Basic_Types.h (ACE_UINT64_MAX):
+
+ Reintroduced this constant for the case where 64 bit integers
+ are natively supported. It was inadvertently removed.
+
+ Removed stray semi-colon in ACE_LACKS_{UNSIGNED}LONGLONG_T
+ case.
+
Fri Mar 2 21:42:54 UTC 2007 Ossama Othman <ossama_othman at symantec dot com>
* ace/Basic_Types.h (ACE_UINT64_MAX):
diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h
index aeb749b1886..66661e00dfa 100644
--- a/ACE/ace/Basic_Types.h
+++ b/ACE/ace/Basic_Types.h
@@ -867,12 +867,14 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# if defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
// ACE_U_LongLong's constructor accepts a "long long" in this
// case.
-# define ACE_UINT64_MAX ACE_U_LongLong (0xFFFFFFFFFFFFFFFF);
+# define ACE_UINT64_MAX ACE_U_LongLong (0xFFFFFFFFFFFFFFFF)
# else
// ACE_U_LongLong's constructor accepts an ACE_UINT32 low and high
// pair of parameters.
-# define ACE_UINT64_MAX ACE_U_LongLong (0xFFFFFFFFu, 0xFFFFFFFFu);
+# define ACE_UINT64_MAX ACE_U_LongLong (0xFFFFFFFFu, 0xFFFFFFFFu)
# endif /* ACE_LACKS_UNSIGNEDLONGLONG_T */
+#else
+# define ACE_UINT64_MAX 0xFFFFFFFFFFFFFFFF
#endif /* ACE_LACKS_LONGLONG_T || defined ACE_LACKS_UNSIGNEDLONGLONG_T */
// These use ANSI/IEEE format.