Add template/typename disambiguators

c++/src/capnp/compiler/node-translator.c++

@@ -2271,7 +2271,7 @@ template <typename InitBrandFunc>
 uint64_t NodeTranslator::compileParamList(
     kj::StringPtr methodName, uint16_t ordinal, bool isResults,
     Declaration::ParamList::Reader paramList,
-    List<Declaration::BrandParameter>::Reader implicitParams,
+    typename List<Declaration::BrandParameter>::Reader implicitParams,
     InitBrandFunc&& initBrand) {
   switch (paramList.which()) {
     case Declaration::ParamList::NAMED_LIST: {

c++/src/capnp/compiler/node-translator.h

@@ -230,7 +230,7 @@ private:
   template <typename InitBrandFunc>
   uint64_t compileParamList(kj::StringPtr methodName, uint16_t ordinal, bool isResults,
                             Declaration::ParamList::Reader paramList,
-                            List<Declaration::BrandParameter>::Reader implicitParams,
+                            typename List<Declaration::BrandParameter>::Reader implicitParams,
                             InitBrandFunc&& initBrand);
   // Compile a param (or result) list and return the type ID of the struct type.
 

c++/src/capnp/compiler/parser.c++

@@ -408,7 +408,7 @@ static Declaration::Builder initMemberDecl(
 }
 
 template <typename BuilderType>
-void initLocation(kj::parse::Span<List<Token>::Reader::Iterator> location,
+void initLocation(kj::parse::Span<typename List<Token>::Reader::Iterator> location,
                   BuilderType builder) {
   if (location.begin() < location.end()) {
     builder.setStartByte(location.begin()->getStartByte());

c++/src/kj/parse/common.h

@@ -160,7 +160,7 @@ private:
 
 template <typename Input, typename Output>
 template <typename ParserImpl>
-constexpr ParserRef<Input, Output>::WrapperImpl<ParserImpl>
+constexpr typename ParserRef<Input, Output>::template WrapperImpl<ParserImpl>
 ParserRef<Input, Output>::WrapperImplInstance<ParserImpl>::instance;
 
 template <typename Input, typename ParserImpl>