From 6abce62b4e7322ce5f8749efd40c8ebdb7d6bfaa Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Fri, 29 Apr 2016 00:45:46 +0000
Subject: [PATCH] Add a return value for nasty_mutex::operator&. Patch from
 STL@microsoft.com

llvm-svn: 267961
---
 libcxx/test/support/nasty_containers.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcxx/test/support/nasty_containers.hpp b/libcxx/test/support/nasty_containers.hpp
index 292181b13bbb..b9ef5a6a7276 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); }