diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-05 16:42:28 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-05 16:42:28 +0000 |
| commit | e7767cfca6663a2bd16e8f2de2c688c4a30bedac (patch) | |
| tree | ea374731ef63d368cb13f4499937aa538f608394 /src/gpu/GrCacheID.cpp | |
| parent | 3ac5eb571bda3422a2868ddcf67ac731e7242a92 (diff) | |
hide the static-assert block altogether, until we can find a construct that
doesn't have warngs on mac or windows
git-svn-id: http://skia.googlecode.com/svn/trunk@7586 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrCacheID.cpp')
| -rw-r--r-- | src/gpu/GrCacheID.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gpu/GrCacheID.cpp b/src/gpu/GrCacheID.cpp index a75054a806..87917ac995 100644 --- a/src/gpu/GrCacheID.cpp +++ b/src/gpu/GrCacheID.cpp @@ -8,6 +8,9 @@ #include "GrTypes.h" #include "SkThread.h" // for sk_atomic_inc +// Well, the dummy_ "fix" caused a warning on windows, so hiding all of it +// until we can find a universal fix. +#if 0 // This used to be a global scope, but we got a warning about unused variable // so we moved it into here. We just want it to compile, so we can test the // static asserts. @@ -17,6 +20,7 @@ static inline void dummy_function_to_avoid_unused_var_warning() { GR_STATIC_ASSERT(sizeof(kAssertKey.fData8) == sizeof(kAssertKey.fData64)); GR_STATIC_ASSERT(sizeof(kAssertKey.fData8) == sizeof(kAssertKey)); } +#endif GrCacheID::Domain GrCacheID::GenerateDomain() { static int32_t gNextDomain = kInvalid_Domain + 1; |