aboutsummaryrefslogtreecommitdiff
path: root/dep/acelite/ace/CDR_Base.h
diff options
context:
space:
mode:
Diffstat (limited to 'dep/acelite/ace/CDR_Base.h')
-rw-r--r--dep/acelite/ace/CDR_Base.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/dep/acelite/ace/CDR_Base.h b/dep/acelite/ace/CDR_Base.h
index 66a6d885710..f324152253f 100644
--- a/dep/acelite/ace/CDR_Base.h
+++ b/dep/acelite/ace/CDR_Base.h
@@ -4,7 +4,7 @@
/**
* @file CDR_Base.h
*
- * $Id: CDR_Base.h 91685 2010-09-09 09:35:14Z johnnyw $
+ * $Id: CDR_Base.h 95761 2012-05-15 18:23:04Z johnnyw $
*
* ACE Common Data Representation (CDR) basic types.
*
@@ -213,7 +213,7 @@ public:
typedef long LongLong;
# elif defined(__TANDEM)
typedef long long LongLong;
-# elif ACE_SIZEOF_LONG_LONG == 8 && !defined (ACE_LACKS_LONGLONG_T)
+# elif ACE_SIZEOF_LONG_LONG == 8
# if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T)
// sun #defines u_longlong_t, maybe other platforms do also.
// Use it, at least with g++, so that its -pedantic doesn't