Merge commit 'ea7aeac570d63a673a082ba216fa119a156620b2' into HEAD
Upgrade glog. Sarah was using LOG_EVERY_T in
2b7e98861367daaccd5f8ac79be7f1d1d23af89e, and it
seemed about time that we upgraded.
This also brings in a fix from Brian to correctly handle
defines in autocxx_library.
Change-Id: I998f1c1f11b7a8b57e1906acdec1f5dd3c995111
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>
diff --git a/aos/network/rawrtc.h b/aos/network/rawrtc.h
index 4c61313..f9de8b0 100644
--- a/aos/network/rawrtc.h
+++ b/aos/network/rawrtc.h
@@ -17,20 +17,19 @@
namespace web_proxy {
// TODO(austin): This doesn't allow streaming data in.
-#define CHECK_RAWRTC(x) \
- [&]() { \
- enum rawrtc_code r = x; \
- return CHECK(r == RAWRTC_CODE_SUCCESS) \
- << " actual " << rawrtc_code_to_str(r); \
+#define CHECK_RAWRTC(x) \
+ [&]() { \
+ enum rawrtc_code r = x; \
+ CHECK(r == RAWRTC_CODE_SUCCESS) << " actual " << rawrtc_code_to_str(r); \
}()
-#define CHECK_RAWRTC_IGNORE(x, i) \
- [&]() { \
- enum rawrtc_code r = x; \
- for (auto w : i) { \
- if (w == r) return; \
- } \
- return CHECK(r == RAWRTC_CODE_SUCCESS); \
+#define CHECK_RAWRTC_IGNORE(x, i) \
+ [&]() { \
+ enum rawrtc_code r = x; \
+ for (auto w : i) { \
+ if (w == r) return; \
+ } \
+ CHECK(r == RAWRTC_CODE_SUCCESS); \
}()
// Wrapper around a RawRTC data channel to manage it's lifetime and provide C++