From 3dab34a5695c6bb0630bfa0b28cfc48741e7eb7f Mon Sep 17 00:00:00 2001 From: James Y Knight Date: Sat, 19 Dec 2015 00:53:22 +0000 Subject: [PATCH] Possibly fix MSVC compilation after r256054. I don't have any way to test MSVC compilation, but maybe this will fix the error: llvm/Support/TrailingObjects.h(286) : error C3210: 'TrailingObjectsBase' : access declaration can only be applied to a base class member llvm/Support/TrailingObjects.h(337) : see reference to class template instantiation 'llvm::TrailingObjects' being compiled llvm/Support/TrailingObjects.h(286) : error C2602: 'llvm::trailing_objects_internal::TrailingObjectsBase::OverloadToken' is not a member of a base class of 'llvm::TrailingObjects' llvm/Support/TrailingObjects.h(91) : see declaration of 'llvm::trailing_objects_internal::TrailingObjectsBase::OverloadToken' git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@256068 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/TrailingObjects.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/llvm/Support/TrailingObjects.h b/include/llvm/Support/TrailingObjects.h index 02dfad7954a..1561e62261d 100644 --- a/include/llvm/Support/TrailingObjects.h +++ b/include/llvm/Support/TrailingObjects.h @@ -283,7 +283,7 @@ class TrailingObjects : private trailing_objects_internal::TrailingObjectsImpl< public: // make this (privately inherited) class public. - using TrailingObjectsBase::OverloadToken; + using ParentType::OverloadToken; /// Returns a pointer to the trailing object array of the given type /// (which must be one of those specified in the class template). The -- 2.34.1