From 4000100e143e364be9f292c38fa1158e3a516c55 Mon Sep 17 00:00:00 2001
From: Morgan Deters <mdeters@gmail.com>
Date: Sun, 27 Mar 2011 19:02:02 +0000
Subject: [PATCH] fixes to attribute-internals warnings on 64-bit; also some
 GCC function attribute cleanup; nothing major

---
 src/expr/attribute_internals.h | 16 ++++++++++++----
 src/include/cvc4_public.h      | 16 +++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/expr/attribute_internals.h b/src/expr/attribute_internals.h
index cdb5735c3..bd3e6eeba 100644
--- a/src/expr/attribute_internals.h
+++ b/src/expr/attribute_internals.h
@@ -411,7 +411,9 @@ class CDAttrHash<bool> :
       d_key(key),
       d_word(word),
       d_bit(bit) {
-      Debug.printf("cdboolattr", "CDAttrHash<bool>::BitAccessor(%p, %p, %llx, %u)\n", &map, key, word, bit);
+      Debug.printf("cdboolattr",
+                   "CDAttrHash<bool>::BitAccessor(%p, %p, %016llx, %u)\n",
+                   &map, key, (unsigned long long) word, bit);
     }
 
     BitAccessor& operator=(bool b) {
@@ -419,19 +421,25 @@ class CDAttrHash<bool> :
         // set the bit
         d_word |= (1 << d_bit);
         d_map.insert(d_key, d_word);
-        Debug.printf("cdboolattr", "CDAttrHash<bool>::BitAccessor::set(%p, %p, %llx, %u)\n", &d_map, d_key, d_word, d_bit);
+        Debug.printf("cdboolattr",
+                     "CDAttrHash<bool>::BitAccessor::set(%p, %p, %016llx, %u)\n",
+                     &d_map, d_key, (unsigned long long) d_word, d_bit);
       } else {
         // clear the bit
         d_word &= ~(1 << d_bit);
         d_map.insert(d_key, d_word);
-        Debug.printf("cdboolattr", "CDAttrHash<bool>::BitAccessor::clr(%p, %p, %llx, %u)\n", &d_map, d_key, d_word, d_bit);
+        Debug.printf("cdboolattr",
+                     "CDAttrHash<bool>::BitAccessor::clr(%p, %p, %016llx, %u)\n",
+                     &d_map, d_key, (unsigned long long) d_word, d_bit);
       }
 
       return *this;
     }
 
     operator bool() const {
-      Debug.printf("cdboolattr", "CDAttrHash<bool>::BitAccessor::toBool(%p, %p, %llx, %u)\n", &d_map, d_key, d_word, d_bit);
+      Debug.printf("cdboolattr",
+                   "CDAttrHash<bool>::BitAccessor::toBool(%p, %p, %016llx, %u)\n",
+                   &d_map, d_key, (unsigned long long) d_word, d_bit);
       return (d_word & (1 << d_bit)) ? true : false;
     }
   };/* class CDAttrHash<bool>::BitAccessor */
diff --git a/src/include/cvc4_public.h b/src/include/cvc4_public.h
index a2db90457..c9aba5952 100644
--- a/src/include/cvc4_public.h
+++ b/src/include/cvc4_public.h
@@ -26,20 +26,20 @@
 #if defined _WIN32 || defined __CYGWIN__
 #  ifdef BUILDING_DLL
 #    ifdef __GNUC__
-#      define CVC4_PUBLIC __attribute__((dllexport))
+#      define CVC4_PUBLIC __attribute__((__dllexport__))
 #    else /* ! __GNUC__ */
 #      define CVC4_PUBLIC __declspec(dllexport)
 #    endif /* __GNUC__ */
 #  else /* BUILDING_DLL */
 #    ifdef __GNUC__
-#      define CVC4_PUBLIC __attribute__((dllimport))
+#      define CVC4_PUBLIC __attribute__((__dllimport__))
 #    else /* ! __GNUC__ */
 #      define CVC4_PUBLIC __declspec(dllimport)
 #    endif /* __GNUC__ */
 #  endif /* BUILDING_DLL */
 #else /* !( defined _WIN32 || defined __CYGWIN__ ) */
 #  if __GNUC__ >= 4
-#    define CVC4_PUBLIC __attribute__ ((visibility("default")))
+#    define CVC4_PUBLIC __attribute__ ((__visibility__("default")))
 #  else /* !( __GNUC__ >= 4 ) */
 #    define CVC4_PUBLIC
 #  endif /* __GNUC__ >= 4 */
@@ -58,7 +58,7 @@
 #ifdef __GNUC__
 #  if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 3 )
      /* error function attribute only exists in GCC >= 4.3.0 */
-#    define CVC4_UNDEFINED __attribute__((error("this function intentionally undefined")))
+#    define CVC4_UNDEFINED __attribute__((__error__("this function intentionally undefined")))
 #  else /* GCC < 4.3.0 */
 #    define CVC4_UNDEFINED
 #  endif /* GCC >= 4.3.0 */
@@ -67,13 +67,15 @@
 #endif /* __GNUC__ */
 
 #ifdef __GNUC__
-#  define CVC4_UNUSED __attribute__((unused))
-#  define CVC4_NORETURN __attribute__ ((noreturn))
-#  define CVC4_CONST_FUNCTION __attribute__ ((const))
+#  define CVC4_UNUSED __attribute__((__unused__))
+#  define CVC4_NORETURN __attribute__ ((__noreturn__))
+#  define CVC4_CONST_FUNCTION __attribute__ ((__const__))
+#  define CVC4_PURE_FUNCTION __attribute__ ((__pure__))
 #else /* ! __GNUC__ */
 #  define CVC4_UNUSED
 #  define CVC4_NORETURN
 #  define CVC4_CONST_FUNCTION
+#  define CVC4_PURE_FUNCTION
 #endif /* __GNUC__ */
 
 #define EXPECT_TRUE(x) __builtin_expect( (x), true )
-- 
2.30.2