| commit | 45bcc7845c4c62f4e334a4a28860767bbceaf8ba | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
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>
diff --git a/src/compiler/translator/SeparateArrayInitialization.cpp b/src/compiler/translator/SeparateArrayInitialization.cpp index 2c853e3..98e010a 100644 --- a/src/compiler/translator/SeparateArrayInitialization.cpp +++ b/src/compiler/translator/SeparateArrayInitialization.cpp
@@ -20,6 +20,9 @@ #include "compiler/translator/IntermNode.h" #include "compiler/translator/OutputHLSL.h" +namespace sh +{ + namespace { @@ -84,3 +87,5 @@ { SeparateArrayInitTraverser::apply(root); } + +} // namespace sh