Switch to new APIs in samples/translator/translator.cpp

Also, fix a few issuse for ninja build "all" to finish. BUG=angle:775 TEST=translator.cc compiles OK Change-Id: I6507e9143882a628a7737dd139efb6d8d358b0db Reviewed-on: https://chromium-review.googlesource.com/227490Tested-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Switch to new APIs in samples/translator/translator.cpp
0bdc0f3e · Zhenyao Mo · 657cd684 · 0bdc0f3e · 0bdc0f3e · 0bdc0f3e
Commit 0bdc0f3e authored Nov 04, 2014 by Zhenyao Mo
Showing with 4 additions and 1 deletion

common_defines.gypi build/common_defines.gypi +1 -1

translator.cpp samples/translator/translator.cpp +0 -0

TextureStorage11.cpp src/libGLESv2/renderer/d3d/d3d11/TextureStorage11.cpp +3 -0

No files found.
--- a/build/common_defines.gypi
+++ b/build/common_defines.gypi
@@ -12,7 +12,7 @@
        'angle_build_winrt%': '0',
        'angle_build_winphone%': '0',
    },
-    'msvs_disabled_warnings': [ 4100, 4127, 4239, 4244, 4245, 4251, 4512, 4702, 4530, 4718, 4267, 4264, 4447, 4075 ],
+    'msvs_disabled_warnings': [ 4075, 4100, 4127, 4239, 4244, 4245, 4251, 4264, 4267, 4447, 4512, 4530, 4702, 4718 ],
    'conditions':
    [
        ['angle_build_winrt==0',

--- a/samples/translator/translator.cpp
+++ b/samples/translator/translator.cpp
--- a/src/libGLESv2/renderer/d3d/d3d11/TextureStorage11.cpp
+++ b/src/libGLESv2/renderer/d3d/d3d11/TextureStorage11.cpp
@@ -8,6 +8,9 @@
 // classes TextureStorage11_2D and TextureStorage11_Cube, which act as the interface to the D3D11 texture.

 #include "libGLESv2/renderer/d3d/d3d11/TextureStorage11.h"
+
+#include <tuple>
+
 #include "libGLESv2/renderer/d3d/d3d11/Renderer11.h"
 #include "libGLESv2/renderer/d3d/d3d11/RenderTarget11.h"
 #include "libGLESv2/renderer/d3d/d3d11/SwapChain11.h"