From b0a5c96379e7f6fd25fc7f8b9cdc237a6852d4e4 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Fri, 14 Jun 2013 19:38:45 +0000
Subject: Replace use of PathV1.h in Program.cpp.

llvm-svn: 183996
---
 llvm/lib/Support/Program.cpp | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'llvm/lib/Support/Program.cpp')

diff --git a/llvm/lib/Support/Program.cpp b/llvm/lib/Support/Program.cpp
index 52208b0..79f7e5f 100644
--- a/llvm/lib/Support/Program.cpp
+++ b/llvm/lib/Support/Program.cpp
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/Program.h"
-#include "llvm/Support/PathV1.h"
 #include "llvm/Config/config.h"
 #include "llvm/Support/system_error.h"
 using namespace llvm;
@@ -23,39 +22,12 @@ using namespace sys;
 //===          independent code.
 //===----------------------------------------------------------------------===//
 
-static bool Execute(void **Data, const Path &path, const char **args,
-                    const char **env, const sys::Path **redirects,
-                    unsigned memoryLimit, std::string *ErrMsg);
-
-static int Wait(void *&Data, const Path &path, unsigned secondsToWait,
-                std::string *ErrMsg);
-
-
 static bool Execute(void **Data, StringRef Program, const char **args,
                     const char **env, const StringRef **Redirects,
-                    unsigned memoryLimit, std::string *ErrMsg) {
-  Path P(Program);
-  if (!Redirects)
-    return Execute(Data, P, args, env, 0, memoryLimit, ErrMsg);
-  Path IO[3];
-  const Path *IOP[3];
-  for (int I = 0; I < 3; ++I) {
-    if (Redirects[I]) {
-      IO[I] = *Redirects[I];
-      IOP[I] = &IO[I];
-    } else {
-      IOP[I] = 0;
-    }
-  }
-
-  return Execute(Data, P, args, env, IOP, memoryLimit, ErrMsg);
-}
+                    unsigned memoryLimit, std::string *ErrMsg);
 
 static int Wait(void *&Data, StringRef Program, unsigned secondsToWait,
-                std::string *ErrMsg) {
-  Path P(Program);
-  return Wait(Data, P, secondsToWait, ErrMsg);
-}
+                std::string *ErrMsg);
 
 int sys::ExecuteAndWait(StringRef Program, const char **args, const char **envp,
                         const StringRef **redirects, unsigned secondsToWait,
-- 
cgit v1.1