diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-03-27 19:02:02 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-03-27 19:02:02 +0000 |
| commit | 4000100e143e364be9f292c38fa1158e3a516c55 (patch) | |
| tree | 9d95a28b1c7f6f577bd5461f8092e5adae460c1f /src/expr/attribute_internals.h | |
| parent | 390477967f6179b03754c27be027b22ea77052bc (diff) | |
fixes to attribute-internals warnings on 64-bit; also some GCC function attribute cleanup; nothing major
Diffstat (limited to 'src/expr/attribute_internals.h')
| -rw-r--r-- | src/expr/attribute_internals.h | 16 |
1 files changed, 12 insertions, 4 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 */ |