This is a patch to fix a compile error in STLExtras.h, and
a bug in GraphWriter.cpp.
cheers,
florian
ps: i'm not subscribed to the commits list, so please cc me in replies.
Index: include/llvm/ADT/STLExtras.h
===================================================================
RCS file: /var/cvs/llvm/llvm/include/llvm/ADT/STLExtras.h,v
retrieving revision 1.21
diff -t -d -u -p -5 -r1.21 STLExtras.h
--- include/llvm/ADT/STLExtras.h 21 Apr 2005 20:13:50 -0000 1.21
+++ include/llvm/ADT/STLExtras.h 2 May 2007 09:46:04 -0000
@@ -69,11 +69,11 @@ public:
typedef void reference; // Can't modify value returned by fn
typedef RootIt iterator_type;
typedef mapped_iterator<RootIt, UnaryFunc> _Self;
- inline RootIt &getCurrent() const { return current; }
+ inline const RootIt &getCurrent() const { return current; }
inline explicit mapped_iterator(const RootIt &I, UnaryFunc F)
: current(I), Fn(F) {}
inline mapped_iterator(const mapped_iterator &It)
: current(It.current), Fn(It.Fn) {}
Index: lib/Support/GraphWriter.cpp
===================================================================
RCS file: /var/cvs/llvm/llvm/lib/Support/GraphWriter.cpp,v
retrieving revision 1.8
diff -t -d -u -p -5 -r1.8 GraphWriter.cpp
--- lib/Support/GraphWriter.cpp 16 Feb 2007 19:11:06 -0000 1.8
+++ lib/Support/GraphWriter.cpp 2 May 2007 09:46:04 -0000
@@ -68,10 +68,11 @@ void llvm::DisplayGraph(const sys::Path
PSFilename.eraseFromDisk();
#elif HAVE_DOTTY
sys::Path dotty(LLVM_PATH_DOTTY);
std::vector<const char*> args;
+ args.push_back(dotty.c_str());
args.push_back(Filename.c_str());
args.push_back(0);
cerr << "Running 'dotty' program... " << std::flush;
if (sys::Program::ExecuteAndWait(dotty, &args[0],0,0,0,0,&ErrMsg)) {
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
