From 74382b7c699120fbec5cb5603c9cf4212eb37f06 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 23 Aug 2009 22:45:37 +0000 Subject: Prune #includes from llvm/Linker.h and llvm/System/Path.h, forcing them down into various .cpp files. This change also: 1. Renames TimeValue::toString() and Path::toString() to ::str() for similarity with the STL. 2. Removes all stream insertion support for sys::Path, forcing clients to call .str(). 3. Removes a use of Config/alloca.h from bugpoint, using smallvector instead. 4. Weans llvm-db off sys::Path really needs to be gutted, but I don't have the desire to do it at this point. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79869 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/GraphWriter.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'include/llvm/Support/GraphWriter.h') diff --git a/include/llvm/Support/GraphWriter.h b/include/llvm/Support/GraphWriter.h index f77b3db673..b88dd3f9a6 100644 --- a/include/llvm/Support/GraphWriter.h +++ b/include/llvm/Support/GraphWriter.h @@ -257,10 +257,8 @@ raw_ostream &WriteGraph(raw_ostream &O, const GraphType &G, } template -sys::Path WriteGraph(const GraphType &G, - const std::string& Name, - bool ShortNames = false, - const std::string& Title = "") { +sys::Path WriteGraph(const GraphType &G, const std::string &Name, + bool ShortNames = false, const std::string &Title = "") { std::string ErrMsg; sys::Path Filename = sys::Path::GetTemporaryDirectory(&ErrMsg); if (Filename.isEmpty()) { @@ -273,7 +271,7 @@ sys::Path WriteGraph(const GraphType &G, return sys::Path(); } - errs() << "Writing '" << Filename << "'... "; + errs() << "Writing '" << Filename.str() << "'... "; std::string ErrorInfo; raw_fd_ostream O(Filename.c_str(), ErrorInfo, raw_fd_ostream::F_Force); @@ -282,7 +280,7 @@ sys::Path WriteGraph(const GraphType &G, WriteGraph(O, G, ShortNames, Name, Title); errs() << " done. \n"; } else { - errs() << "error opening file '" << Filename << "' for writing!\n"; + errs() << "error opening file '" << Filename.str() << "' for writing!\n"; Filename.clear(); } @@ -293,16 +291,13 @@ sys::Path WriteGraph(const GraphType &G, /// then cleanup. For use from the debugger. /// template -void ViewGraph(const GraphType& G, - const std::string& Name, - bool ShortNames = false, - const std::string& Title = "", +void ViewGraph(const GraphType &G, const std::string &Name, + bool ShortNames = false, const std::string &Title = "", GraphProgram::Name Program = GraphProgram::DOT) { - sys::Path Filename = WriteGraph(G, Name, ShortNames, Title); + sys::Path Filename = WriteGraph(G, Name, ShortNames, Title); - if (Filename.isEmpty()) { + if (Filename.isEmpty()) return; - } DisplayGraph(Filename, true, Program); } -- cgit v1.2.3