diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-04-29 00:45:46 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-04-29 00:45:46 +0000 |
| commit | 6abce62b4e7322ce5f8749efd40c8ebdb7d6bfaa (patch) | |
| tree | b5ac5e8ac66e36cd47497a13b4a2efb960dbe642 /libcxx/test | |
| parent | a0193ecfe1c8c5b4440404e0031f8532052aec4e (diff) | |
| download | bcm5719-llvm-6abce62b4e7322ce5f8749efd40c8ebdb7d6bfaa.tar.gz bcm5719-llvm-6abce62b4e7322ce5f8749efd40c8ebdb7d6bfaa.zip | |
Add a return value for nasty_mutex::operator&. Patch from STL@microsoft.com
llvm-svn: 267961
Diffstat (limited to 'libcxx/test')
| -rw-r--r-- | libcxx/test/support/nasty_containers.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/test/support/nasty_containers.hpp b/libcxx/test/support/nasty_containers.hpp index 292181b13bb..b9ef5a6a727 100644 --- a/libcxx/test/support/nasty_containers.hpp +++ b/libcxx/test/support/nasty_containers.hpp @@ -287,7 +287,7 @@ public: nasty_mutex() _NOEXCEPT {} ~nasty_mutex() {} - nasty_mutex *operator& () { assert(false); } + nasty_mutex *operator& () { assert(false); return nullptr; } template <typename T> void operator, (const T &) { assert(false); } |
