commit 45bcc7845c4c62f4e334a4a28860767bbceaf8ba
author Jamie Madill <jmadill@chromium.org> Mon Nov 07 13:58:48 2016 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Nov 08 03:25:27 2016 +0000
tree 23b1ca0af8d81ef8e93aeb68c66a5ecae9199dc4
parent 20c97cac2a15144b61ceec7404a9e6249c40f50a

translator: Scope all classes with "sh".

I was seeing an odd problem with our PoolAlloc conflicting with the
glslang/Vulkan TIntermNode, so the fix was to move everything to a
separate namespace.

The bison grammars are also regenerated. No functional changes.

BUG=angleproject:1576

Change-Id: I959c7afe4c092f0d458432c07b4dcee4d39513f3
Reviewed-on: https://chromium-review.googlesource.com/408267
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/VersionGLSL.h

diff --git a/src/compiler/translator/VersionGLSL.h b/src/compiler/translator/VersionGLSL.h
index f03a48b..380349b 100644
--- a/src/compiler/translator/VersionGLSL.h
+++ b/src/compiler/translator/VersionGLSL.h
@@ -11,6 +11,9 @@
 
 #include "compiler/translator/Pragma.h"
 
+namespace sh
+{
+
 static const int GLSL_VERSION_110 = 110;
 static const int GLSL_VERSION_120 = 120;
 static const int GLSL_VERSION_130 = 130;
@@ -66,4 +69,6 @@
     int mVersion;
 };
 
+}  // namespace sh
+
 #endif  // COMPILER_TRANSLATOR_VERSIONGLSL_H_