Two fixes to make Clang build on Visual C++ (again), from Alisdair Meredith.
llvm-svn: 74606
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index 88dd6f7..561dc57 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -62,17 +62,17 @@
// Defines specific to certain operating systems.
//===----------------------------------------------------------------------===//
namespace {
-template<typename TargetInfo>
-class OSTargetInfo : public TargetInfo {
+template<typename TgtInfo>
+class OSTargetInfo : public TgtInfo {
protected:
virtual void getOSDefines(const LangOptions &Opts, const char *Triple,
std::vector<char> &Defines) const=0;
public:
- OSTargetInfo(const std::string& triple) : TargetInfo(triple) {}
+ OSTargetInfo(const std::string& triple) : TgtInfo(triple) {}
virtual void getTargetDefines(const LangOptions &Opts,
std::vector<char> &Defines) const {
- TargetInfo::getTargetDefines(Opts, Defines);
- getOSDefines(Opts, TargetInfo::getTargetTriple(), Defines);
+ TgtInfo::getTargetDefines(Opts, Defines);
+ getOSDefines(Opts, TgtInfo::getTargetTriple(), Defines);
}
};