From 22eff1eb8c2ff44e1928121d93559fcf0b81f834 Mon Sep 17 00:00:00 2001 From: Carl Woffenden Date: Tue, 12 Jan 2021 19:47:13 +0000 Subject: [PATCH] Fixes to build with MSVC 2019 When building with MSVC (using 'is_clang=false') various errors are encountered. This fixes: - multiple tests/end2end/ColorStateTests.cpp(309): error C2039: 'transform': is not a member of 'std' - dawn_wire/server/Server.h(171): error C2248: 'dawn_wire::server::MapUserdata::MapUserdata': cannot access private member declared in class 'dawn_wire::server::MapUserdata' - variants of the above in Server.h for all the other CallbackUserdata subclasses Bug: dawn:602 Change-Id: I01b1db3fbf67ae170b21a7d890af6162b82a1725 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/37420 Commit-Queue: Carl Woffenden Reviewed-by: Austin Eng --- src/dawn_wire/server/Server.h | 2 -- src/tests/end2end/ColorStateTests.cpp | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dawn_wire/server/Server.h b/src/dawn_wire/server/Server.h index 7b673d8a94..d503e818c3 100644 --- a/src/dawn_wire/server/Server.h +++ b/src/dawn_wire/server/Server.h @@ -53,8 +53,6 @@ namespace dawn_wire { namespace server { Server* const server; std::weak_ptr const serverIsAlive; - private: - friend class Server; CallbackUserdata() = delete; CallbackUserdata(Server* server, const std::shared_ptr& serverIsAlive) : server(server), serverIsAlive(serverIsAlive) { diff --git a/src/tests/end2end/ColorStateTests.cpp b/src/tests/end2end/ColorStateTests.cpp index 0327565336..973a923c2e 100644 --- a/src/tests/end2end/ColorStateTests.cpp +++ b/src/tests/end2end/ColorStateTests.cpp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include