diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-01-15 20:26:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-15 20:26:02 +0000 |
| commit | c7614eb7cf2e3e121baa3de26e3622974a163786 (patch) | |
| tree | f2a7b3d4cfc8109459b3ccd0cf8f5a8a26a9e4b2 /services/camera/libcameraservice/gui | |
| parent | e311b15cf821f65f68af2cdfe01e864cbc9a86ce (diff) | |
| parent | cd4f9920f5658fcf1bf62bfebf5232a1fea06ea6 (diff) | |
| download | frameworks_av-c7614eb7cf2e3e121baa3de26e3622974a163786.zip frameworks_av-c7614eb7cf2e3e121baa3de26e3622974a163786.tar.gz frameworks_av-c7614eb7cf2e3e121baa3de26e3622974a163786.tar.bz2 | |
Merge "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) |