Compile fixes for JBMR2.

Change-Id: I121abb32d898f5887586680b52c4283ee6e58f96 Reviewed-on: https://swiftshader-review.googlesource.com/3472Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Compile fixes for JBMR2.
d71948f8 · Nicolas Capens · 94352d96 · d71948f8 · d71948f8
Commit d71948f8 authored Jun 10, 2015 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

Types.h src/OpenGL/compiler/Types.h +1 -0

Program.cpp src/OpenGL/libGLESv2/Program.cpp +3 -3

No files found.
--- a/src/OpenGL/compiler/Types.h
+++ b/src/OpenGL/compiler/Types.h
@@ -63,6 +63,7 @@ inline TFieldList *NewPoolTFieldList()
 class TFieldListCollection
 {
 public:
+	virtual ~TFieldListCollection() { }
 	const TString &name() const
 	{
 		return *mName;

--- a/src/OpenGL/libGLESv2/Program.cpp
+++ b/src/OpenGL/libGLESv2/Program.cpp
@@ -2534,9 +2534,9 @@ namespace es2
 			if(uniformBlock.isArrayElement())
 			{
-				string += "[";
+				std::ostringstream elementIndex;
-				string += std::to_string(uniformBlock.elementIndex);
+				elementIndex << uniformBlock.elementIndex;
-				string += "]";
+				string += "[" + elementIndex.str()  + "]";
 			}
 			strncpy(name, string.c_str(), bufSize);