summaryrefslogtreecommitdiffstats
path: root/include/private
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-06-04 23:29:29 -0700
committerMathias Agopian <mathias@google.com>2009-06-04 23:29:29 -0700
commiteb22c5b358af775a5f1192fc248594c7a0025d56 (patch)
tree970cc409d50ba943b6d8fd14fc4198173bbdc94d /include/private
parent2d5ee25556cb363700dc5127f88ca05fb9493e14 (diff)
downloadframeworks_base-eb22c5b358af775a5f1192fc248594c7a0025d56.zip
frameworks_base-eb22c5b358af775a5f1192fc248594c7a0025d56.tar.gz
frameworks_base-eb22c5b358af775a5f1192fc248594c7a0025d56.tar.bz2
cleanup Debug.h a bit
Diffstat (limited to 'include/private')
-rw-r--r--include/private/ui/SharedState.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/include/private/ui/SharedState.h b/include/private/ui/SharedState.h
index 646cc10..3bc7979 100644
--- a/include/private/ui/SharedState.h
+++ b/include/private/ui/SharedState.h
@@ -20,6 +20,7 @@
#include <stdint.h>
#include <sys/types.h>
+#include <utils/Debug.h>
#include <utils/threads.h>
namespace android {
@@ -140,19 +141,11 @@ struct surface_flinger_cblk_t // 4KB max
// ---------------------------------------------------------------------------
-template<bool> struct CTA;
-template<> struct CTA<true> { };
-
-// compile-time assertions. just to avoid catastrophes.
-inline void compile_time_asserts() {
- CTA<sizeof(layer_cblk_t) == 128> sizeof__layer_cblk_t__eq_128;
- (void)sizeof__layer_cblk_t__eq_128; // we don't want a warning
- CTA<sizeof(per_client_cblk_t) <= 4096> sizeof__per_client_cblk_t__le_4096;
- (void)sizeof__per_client_cblk_t__le_4096; // we don't want a warning
- CTA<sizeof(surface_flinger_cblk_t) <= 4096> sizeof__surface_flinger_cblk_t__le_4096;
- (void)sizeof__surface_flinger_cblk_t__le_4096; // we don't want a warning
-}
+COMPILE_TIME_ASSERT(sizeof(layer_cblk_t) == 128)
+COMPILE_TIME_ASSERT(sizeof(per_client_cblk_t) <= 4096)
+COMPILE_TIME_ASSERT(sizeof(surface_flinger_cblk_t) <= 4096)
+// ---------------------------------------------------------------------------
}; // namespace android
#endif // ANDROID_UI_SHARED_STATE_H