[PATCH] D48062: Fix that AlignedAllocation.h doesn't compile because of VersionTuple

[Raphael Isemann via Phabricator via cfe-commits]

teemperor created this revision.

https://reviews.llvm.org/rL334399 put VersionTuple in the llvm namespace, but 
this header still assumes it's in the clang namespace.
This leads to compilation failures with enabled modules when building Clang.


Repository:
  rC Clang

https://reviews.llvm.org/D48062

Files:
  include/clang/Basic/AlignedAllocation.h


Index: include/clang/Basic/AlignedAllocation.h
===================================================================
--- include/clang/Basic/AlignedAllocation.h
+++ include/clang/Basic/AlignedAllocation.h
@@ -22,18 +22,18 @@
 
 namespace clang {
 
-inline VersionTuple alignedAllocMinVersion(llvm::Triple::OSType OS) {
+inline llvm::VersionTuple alignedAllocMinVersion(llvm::Triple::OSType OS) {
   switch (OS) {
   default:
     break;
   case llvm::Triple::Darwin:
   case llvm::Triple::MacOSX: // Earliest supporting version is 10.13.
-    return VersionTuple(10U, 13U);
+    return llvm::VersionTuple(10U, 13U);
   case llvm::Triple::IOS:
   case llvm::Triple::TvOS: // Earliest supporting version is 11.0.0.
-    return VersionTuple(11U);
+    return llvm::VersionTuple(11U);
   case llvm::Triple::WatchOS: // Earliest supporting version is 4.0.0.
-    return VersionTuple(4U);
+    return llvm::VersionTuple(4U);
   }
 
   llvm_unreachable("Unexpected OS");



Index: include/clang/Basic/AlignedAllocation.h
===================================================================
--- include/clang/Basic/AlignedAllocation.h
+++ include/clang/Basic/AlignedAllocation.h
@@ -22,18 +22,18 @@
 
 namespace clang {
 
-inline VersionTuple alignedAllocMinVersion(llvm::Triple::OSType OS) {
+inline llvm::VersionTuple alignedAllocMinVersion(llvm::Triple::OSType OS) {
   switch (OS) {
   default:
     break;
   case llvm::Triple::Darwin:
   case llvm::Triple::MacOSX: // Earliest supporting version is 10.13.
-    return VersionTuple(10U, 13U);
+    return llvm::VersionTuple(10U, 13U);
   case llvm::Triple::IOS:
   case llvm::Triple::TvOS: // Earliest supporting version is 11.0.0.
-    return VersionTuple(11U);
+    return llvm::VersionTuple(11U);
   case llvm::Triple::WatchOS: // Earliest supporting version is 4.0.0.
-    return VersionTuple(4U);
+    return llvm::VersionTuple(4U);
   }
 
   llvm_unreachable("Unexpected OS");

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits