diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-10-07 18:51:33 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-10-07 18:51:33 +0000 |
| commit | 89c91914471ac85026855cefb5025292adba79b2 (patch) | |
| tree | 7c7df51c016fed683265fd21bd9e14c4cbe6b540 /libcxx/test/support/test_allocator.h | |
| parent | c0169fa94f2fba17d4a419387c42b12e15f4f996 (diff) | |
| download | bcm5719-llvm-89c91914471ac85026855cefb5025292adba79b2.tar.gz bcm5719-llvm-89c91914471ac85026855cefb5025292adba79b2.zip | |
Remove MSVC workarounds. Patch from STL@microsoft.com
llvm-svn: 283580
Diffstat (limited to 'libcxx/test/support/test_allocator.h')
| -rw-r--r-- | libcxx/test/support/test_allocator.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libcxx/test/support/test_allocator.h b/libcxx/test/support/test_allocator.h index e73a353842b..394d1ccd450 100644 --- a/libcxx/test/support/test_allocator.h +++ b/libcxx/test/support/test_allocator.h @@ -88,10 +88,7 @@ public: {::new(static_cast<void*>(p)) T(std::forward<U>(val));} #endif void destroy(pointer p) - { - p->~T(); - ((void)p); // Prevent MSVC's spurious unused warning - } + {p->~T();} friend bool operator==(const test_allocator& x, const test_allocator& y) {return x.data_ == y.data_;} friend bool operator!=(const test_allocator& x, const test_allocator& y) @@ -291,10 +288,7 @@ public: template<typename U, typename... Args> void destroy(U* p) - { - p->~U(); - ((void)p); // Prevent MSVC's spurious unused warning - } + { p->~U(); } }; template<typename T, typename U> |
