summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael J. Spencer <bigcheesegs@gmail.com>2010-12-25 20:10:11 +0000
committerMichael J. Spencer <bigcheesegs@gmail.com>2010-12-25 20:10:11 +0000
commite13f1ead9b708de8c8297901773cd5bd9328846e (patch)
tree4d4e7491afedda69ddc5cbd5bad51ac21d939193
parentbc7fcc21916da0b30f3ace7b869295269b2fc0ec (diff)
downloadbcm5719-llvm-e13f1ead9b708de8c8297901773cd5bd9328846e.tar.gz
bcm5719-llvm-e13f1ead9b708de8c8297901773cd5bd9328846e.zip
Support/PathV1: Deprecate makeAbsolute and remove Unix impl because it annoys people.
llvm-svn: 122553
-rw-r--r--llvm/include/llvm/Support/PathV1.h4
-rw-r--r--llvm/lib/Support/Unix/Path.inc12
2 files changed, 3 insertions, 13 deletions
diff --git a/llvm/include/llvm/Support/PathV1.h b/llvm/include/llvm/Support/PathV1.h
index b1b61b6c9a8..a22c40f51b3 100644
--- a/llvm/include/llvm/Support/PathV1.h
+++ b/llvm/include/llvm/Support/PathV1.h
@@ -494,7 +494,9 @@ namespace sys {
/// The current Path name is made absolute by prepending the
/// current working directory if necessary.
- void makeAbsolute();
+ LLVM_ATTRIBUTE_DEPRECATED(
+ void makeAbsolute(),
+ LLVMV_PATH_DEPRECATED_MSG(fs::make_absolute));
/// @}
/// @name Disk Mutators
diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc
index dccf9010ab5..b21245c8207 100644
--- a/llvm/lib/Support/Unix/Path.inc
+++ b/llvm/lib/Support/Unix/Path.inc
@@ -119,18 +119,6 @@ Path::isAbsolute() const {
return path[0] == '/';
}
-void Path::makeAbsolute() {
- if (isAbsolute())
- return;
-
- Path CWD = Path::GetCurrentDirectory();
- assert(CWD.isAbsolute() && "GetCurrentDirectory returned relative path!");
-
- CWD.appendComponent(path);
-
- path = CWD.str();
-}
-
Path
Path::GetRootDirectory() {
Path result;
OpenPOWER on IntegriCloud