tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 6bafdcb5: am 4f1fe2f5: Merge "Fix build in C++11 mode"

Browse source 
* commit '6bafdcb5083b81d295676ee0ff75f62b31214150':
  Fix build in C++11 mode
This commit is contained in:
Dan Albert 2014-12-17 02:48:22 +00:00 committed by Android Git Automerger
commit e854d1c5de
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/camera2/Android.mk
View file

@ -35,7 +35,6 @@ LOCAL_C_INCLUDES += \
frameworks/native/include \
LOCAL_CFLAGS += -Wall -Wextra
LOCAL_CPPFLAGS := -std=gnu++98
LOCAL_MODULE:= camera2_test
LOCAL_MODULE_STEM_32 := camera2_test
LOCAL_MODULE_STEM_64 := camera2_test64

2
tests/camera2/CameraBurstTests.cpp
View file

@ -49,7 +49,7 @@
#define dout if (0) std::cout
#endif
#define WARN_UNLESS(condition) (!(condition) ? (std::cerr) : (std::ostream(NULL)) << "Warning: ")
#define WARN_UNLESS(condition) if(!(condition)) std::cerr << "Warning: "
#define WARN_LE(exp, act) WARN_UNLESS((exp) <= (act))
#define WARN_LT(exp, act) WARN_UNLESS((exp) < (act))
#define WARN_GT(exp, act) WARN_UNLESS((exp) > (act))