diff --git a/clang/include/clang/Frontend/MultiplexConsumer.h b/clang/include/clang/Frontend/MultiplexConsumer.h index d95c069731cf..7299f73d979a 100644 --- a/clang/include/clang/Frontend/MultiplexConsumer.h +++ b/clang/include/clang/Frontend/MultiplexConsumer.h @@ -15,6 +15,7 @@ #ifndef CLANG_FRONTEND_MULTIPLEXCONSUMER_H #define CLANG_FRONTEND_MULTIPLEXCONSUMER_H +#include "clang/Basic/LLVM.h" #include "clang/Sema/SemaConsumer.h" #include "llvm/ADT/OwningPtr.h" #include @@ -28,7 +29,7 @@ class MultiplexASTDeserializationListener; class MultiplexConsumer : public SemaConsumer { public: // Takes ownership of the pointers in C. - MultiplexConsumer(const std::vector& C); + MultiplexConsumer(ArrayRef C); ~MultiplexConsumer(); // ASTConsumer diff --git a/clang/lib/Frontend/MultiplexConsumer.cpp b/clang/lib/Frontend/MultiplexConsumer.cpp index 6ca40abc2abe..f57b16b82473 100644 --- a/clang/lib/Frontend/MultiplexConsumer.cpp +++ b/clang/lib/Frontend/MultiplexConsumer.cpp @@ -148,8 +148,9 @@ void MultiplexASTMutationListener::StaticDataMemberInstantiated( } // end namespace clang -MultiplexConsumer::MultiplexConsumer(const std::vector& C) - : Consumers(C), MutationListener(0), DeserializationListener(0) { +MultiplexConsumer::MultiplexConsumer(ArrayRef C) + : Consumers(C.begin(), C.end()), + MutationListener(0), DeserializationListener(0) { // Collect the mutation listeners and deserialization listeners of all // children, and create a multiplex listener each if so. std::vector mutationListeners;