diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-01-15 20:37:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 20:37:17 +0000 |
| commit | b1c8d9fbc69e2f103699d24a81c2406e52a94c9f (patch) | |
| tree | 5b001bb1ceb4c9b61c576e4b3c4efc2c915eb7a4 /services/camera/libcameraservice/gui | |
| parent | ac1954cb9a480a409e8cee4193fc534a6a29fbb6 (diff) | |
| parent | a2949165680158db31dc1fce32f62bbe70c31820 (diff) | |
| download | frameworks_av-b1c8d9fbc69e2f103699d24a81c2406e52a94c9f.zip frameworks_av-b1c8d9fbc69e2f103699d24a81c2406e52a94c9f.tar.gz frameworks_av-b1c8d9fbc69e2f103699d24a81c2406e52a94c9f.tar.bz2 | |
am a2949165: am 3eccdde9: am c7614eb7: Merge "libcameraservice: Fix build in ISO C++11 mode"
* commit 'a2949165680158db31dc1fce32f62bbe70c31820':
libcameraservice: Fix build in ISO C++11 mode
Diffstat (limited to 'services/camera/libcameraservice/gui')
| -rw-r--r-- | services/camera/libcameraservice/gui/RingBufferConsumer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/gui/RingBufferConsumer.cpp b/services/camera/libcameraservice/gui/RingBufferConsumer.cpp index ebc7ea7..9a6dc28 100644 --- a/services/camera/libcameraservice/gui/RingBufferConsumer.cpp +++ b/services/camera/libcameraservice/gui/RingBufferConsumer.cpp @@ -21,11 +21,11 @@ #include <gui/RingBufferConsumer.h> -#define BI_LOGV(x, ...) ALOGV("[%s] "x, mName.string(), ##__VA_ARGS__) -#define BI_LOGD(x, ...) ALOGD("[%s] "x, mName.string(), ##__VA_ARGS__) -#define BI_LOGI(x, ...) ALOGI("[%s] "x, mName.string(), ##__VA_ARGS__) -#define BI_LOGW(x, ...) ALOGW("[%s] "x, mName.string(), ##__VA_ARGS__) -#define BI_LOGE(x, ...) ALOGE("[%s] "x, mName.string(), ##__VA_ARGS__) +#define BI_LOGV(x, ...) ALOGV("[%s] " x, mName.string(), ##__VA_ARGS__) +#define BI_LOGD(x, ...) ALOGD("[%s] " x, mName.string(), ##__VA_ARGS__) +#define BI_LOGI(x, ...) ALOGI("[%s] " x, mName.string(), ##__VA_ARGS__) +#define BI_LOGW(x, ...) ALOGW("[%s] " x, mName.string(), ##__VA_ARGS__) +#define BI_LOGE(x, ...) ALOGE("[%s] " x, mName.string(), ##__VA_ARGS__) #undef assert #define assert(x) ALOG_ASSERT((x), #x) |