Chromium Code Reviews| Index: webrtc/base/optional.cc |
| diff --git a/webrtc/base/logging_mac.mm b/webrtc/base/optional.cc |
| similarity index 63% |
| copy from webrtc/base/logging_mac.mm |
| copy to webrtc/base/optional.cc |
| index ffee3541a48245e0179670ce2b013f957bc6b88a..01c4951eaa4446737488f939c3ef6ec71ac99780 100644 |
| --- a/webrtc/base/logging_mac.mm |
| +++ b/webrtc/base/optional.cc |
| @@ -8,15 +8,16 @@ |
| * be found in the AUTHORS file in the root of the source tree. |
| */ |
| -#include "webrtc/base/logging.h" |
| +#include "webrtc/base/optional.h" |
|
ossu
2016/09/05 08:27:21
This all is just rietveld going crazy trying to fi
kwiberg-webrtc
2016/09/05 09:11:30
Yes. (Specifically, I think it's git.)
ossu
2016/09/05 09:38:43
Acknowledged.
|
| -#import <Foundation/Foundation.h> |
| +namespace rtc { |
| +namespace internal { |
| +#if RTC_HAS_ASAN |
| -namespace rtc { |
| -std::string DescriptionFromOSStatus(OSStatus err) { |
| - NSError* error = |
| - [NSError errorWithDomain:NSOSStatusErrorDomain code:err userInfo:nil]; |
| - return error.description.UTF8String; |
| -} |
| +void* FunctionThatDoesNothingImpl(void* x) { return x; } |
| + |
| +#endif |
| + |
| +} // namespace internal |
| } // namespace rtc |