diff options
| author | thakis@chromium.org <thakis@chromium.org> | 2014-08-29 03:00:15 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org> | 2014-08-29 03:00:15 +0000 |
| commit | 9426b888d5e248adb87c2c2dcb4d4b95e14d1226 (patch) | |
| tree | 0217fce987d6cfd6e81df3662f11d8af39818687 /examples | |
| parent | 85c1c987e5b2ec2206f0969e6eececa3ef8b346b (diff) | |
| download | talk-9426b888d5e248adb87c2c2dcb4d4b95e14d1226.tar.gz | |
win: Replace custom assert() macro with regular assert.h
The current code got added in libjingle r103; I don't see a good reason for it.
Things still build with plain old assert.h.
The custom assert was wrong: __debugbreak() is documented to return void,
so doing `cond ? true : __debugbreak()` shouldn't build (and it doesn't in
clang-cl). It's possible to make it build by writing
`cond ? true : (__debugbreak(), true)`, but just using the regular header
seems like a much better fix.
BUG=chromium:82385
Review URL: https://webrtc-codereview.appspot.com/19139004/
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7007 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/peerconnection/server/utils.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/examples/peerconnection/server/utils.h b/examples/peerconnection/server/utils.h index d05a2c3..5320d5a 100644 --- a/examples/peerconnection/server/utils.h +++ b/examples/peerconnection/server/utils.h @@ -29,18 +29,7 @@ #define TALK_EXAMPLES_PEERCONNECTION_SERVER_UTILS_H_ #pragma once -#ifndef assert -#ifndef WIN32 #include <assert.h> -#else -#ifndef NDEBUG -#define assert(expr) ((void)((expr) ? true : __debugbreak())) -#else -#define assert(expr) ((void)0) -#endif // NDEBUG -#endif // WIN32 -#endif // assert - #include <string> #ifndef ARRAYSIZE |