r296980 - GCC workaround: use explicit qualification to avoid injected class name.

[John McCall via cfe-commits]

Author: rjmccall
Date: Sat Mar  4 15:46:14 2017
New Revision: 296980

URL: http://llvm.org/viewvc/llvm-project?rev=296980&view=rev
Log:
GCC workaround: use explicit qualification to avoid injected class name.

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52625

Modified:
    cfe/trunk/include/clang/CodeGen/ConstantInitBuilder.h

Modified: cfe/trunk/include/clang/CodeGen/ConstantInitBuilder.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/CodeGen/ConstantInitBuilder.h?rev=296980&r1=296979&r2=296980&view=diff
==============================================================================
--- cfe/trunk/include/clang/CodeGen/ConstantInitBuilder.h (original)
+++ cfe/trunk/include/clang/CodeGen/ConstantInitBuilder.h Sat Mar  4 15:46:14 2017
@@ -485,8 +485,10 @@ class ConstantArrayBuilder
     : public ConstantArrayBuilderTemplateBase<ConstantInitBuilderTraits> {
   template <class Traits>
   friend class ConstantInitBuilderTemplateBase;
+
+  // The use of explicit qualification is a GCC workaround.
   template <class Impl, class Traits>
-  friend class ConstantAggregateBuilderTemplateBase;
+  friend class CodeGen::ConstantAggregateBuilderTemplateBase;
 
   ConstantArrayBuilder(ConstantInitBuilder &builder,
                        ConstantAggregateBuilderBase *parent,
@@ -500,8 +502,10 @@ class ConstantStructBuilder
     : public ConstantStructBuilderTemplateBase<ConstantInitBuilderTraits> {
   template <class Traits>
   friend class ConstantInitBuilderTemplateBase;
+
+  // The use of explicit qualification is a GCC workaround.
   template <class Impl, class Traits>
-  friend class ConstantAggregateBuilderTemplateBase;
+  friend class CodeGen::ConstantAggregateBuilderTemplateBase;
 
   ConstantStructBuilder(ConstantInitBuilder &builder,
                         ConstantAggregateBuilderBase *parent,