Remove the usage of some c++11 library features

src/tests/gl_tests/GLSLTest.cpp

@@ -1151,14 +1151,14 @@ TEST_P(GLSLTest, VerifyMaxVertexUniformVectors)
 
     for (int i = 0; i < maxUniforms; i++)
     {
-        vshaderSource << "uniform vec4 v" << std::to_string(i) << ";\n";
+        vshaderSource << "uniform vec4 v" << i << ";\n";
     }
 
     vshaderSource << "void main()\n{\n";
 
     for (int i = 0; i < maxUniforms; i++)
     {
-        vshaderSource << "    gl_Position +=  v" << std::to_string(i) << ";\n";
+        vshaderSource << "    gl_Position +=  v" << i << ";\n";
     }
 
     vshaderSource << "}\n";
@@ -1192,14 +1192,14 @@ TEST_P(GLSLTest, VerifyMaxVertexUniformVectorsExceeded)
 
     for (int i = 0; i < maxUniforms; i++)
     {
-        vshaderSource << "uniform vec4 v" << std::to_string(i) << ";\n";
+        vshaderSource << "uniform vec4 v" << i << ";\n";
     }
 
     vshaderSource << "void main()\n{\n";
 
     for (int i = 0; i < maxUniforms; i++)
     {
-        vshaderSource << "    gl_Position +=  v" << std::to_string(i) << ";\n";
+        vshaderSource << "    gl_Position +=  v" << i << ";\n";
     }
 
     vshaderSource << "}\n";
@@ -1231,14 +1231,14 @@ TEST_P(GLSLTest, VerifyMaxFragmentUniformVectorsFragment)
 
     for (int i = 0; i < maxUniforms; i++)
     {
-        fshaderSource << "uniform vec4 v" << std::to_string(i) << ";\n";
+        fshaderSource << "uniform vec4 v" << i << ";\n";
     }
 
     fshaderSource << "void main()\n{\n";
 
     for (int i = 0; i < maxUniforms; i++)
     {
-        fshaderSource << "    gl_FragColor +=  v" << std::to_string(i) << ";\n";
+        fshaderSource << "    gl_FragColor +=  v" << i << ";\n";
     }
 
     fshaderSource << "}\n";
@@ -1272,14 +1272,14 @@ TEST_P(GLSLTest, VerifyMaxFragmentUniformVectorsFragmentExceeded)
 
     for (int i = 0; i < maxUniforms; i++)
     {
-        fshaderSource << "uniform vec4 v" << std::to_string(i) << ";\n";
+        fshaderSource << "uniform vec4 v" << i << ";\n";
     }
 
     fshaderSource << "void main()\n{\n";
 
     for (int i = 0; i < maxUniforms; i++)
     {
-        fshaderSource << "    gl_FragColor +=  v" << std::to_string(i) << ";\n";
+        fshaderSource << "    gl_FragColor +=  v" << i << ";\n";
     }
 
     fshaderSource << "}\n";

src/tests/gl_tests/UnpackAlignmentTest.cpp

@@ -6,8 +6,6 @@
 
 #include "test_utils/ANGLETest.h"
 
-#include <array>
-
 using namespace angle;
 
 namespace
@@ -114,8 +112,8 @@ class UnpackAlignmentTest : public ANGLETest
         glGetIntegerv(GL_UNPACK_ALIGNMENT, &readbackAlignment);
         EXPECT_EQ(alignment, readbackAlignment);
 
-        std::array<GLubyte, 1024> buf;
-        std::fill(buf.begin(), buf.end(), 0);
+        GLubyte buf[1024];
+        memset(buf, 0, sizeof(buf));
 
         unsigned int pixelSize;
         getPixelSize(format, type, &pixelSize);

src/tests/gl_tests/UnpackRowLength.cpp

@@ -6,8 +6,6 @@
 
 #include "test_utils/ANGLETest.h"
 
-#include <array>
-
 using namespace angle;
 
 namespace

util/shader_utils.cpp

@@ -12,7 +12,7 @@
 
 static std::string ReadFileToString(const std::string &source)
 {
-    std::ifstream stream(source);
+    std::ifstream stream(source.c_str());
     if (!stream)
     {
         std::cerr << "Failed to load shader file: " << source;