From: Anton Korobeynikov <asl@math.spbu.ru>
Date: Wed, 24 Sep 2008 22:23:17 +0000 (+0000)
Subject: Finally get rid of virtual inheritance in TAI
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b7679bd0cb45b020f8c6288fdc094808db657e9b;p=oota-llvm.git

Finally get rid of virtual inheritance in TAI

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56589 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Target/DarwinTargetAsmInfo.h b/include/llvm/Target/DarwinTargetAsmInfo.h
index 0ca5a705556..dab591aa036 100644
--- a/include/llvm/Target/DarwinTargetAsmInfo.h
+++ b/include/llvm/Target/DarwinTargetAsmInfo.h
@@ -24,7 +24,7 @@ namespace llvm {
   class Type;
   class Mangler;
 
-  struct DarwinTargetAsmInfo: public virtual TargetAsmInfo {
+  struct DarwinTargetAsmInfo: public TargetAsmInfo {
     const Section* TextCoalSection;
     const Section* ConstDataCoalSection;
     const Section* ConstDataSection;
diff --git a/include/llvm/Target/ELFTargetAsmInfo.h b/include/llvm/Target/ELFTargetAsmInfo.h
index 3dacb33eb32..593d9b14f87 100644
--- a/include/llvm/Target/ELFTargetAsmInfo.h
+++ b/include/llvm/Target/ELFTargetAsmInfo.h
@@ -23,7 +23,7 @@ namespace llvm {
   class GlobalVariable;
   class Type;
 
-  struct ELFTargetAsmInfo: public virtual TargetAsmInfo {
+  struct ELFTargetAsmInfo: public TargetAsmInfo {
     explicit ELFTargetAsmInfo(const TargetMachine &TM);
 
     virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;