projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace the BUILTIN_EXPECT macro with a less horrible LLVM_LIKELY/LLVM_UNLIKELY inter...
[oota-llvm.git]
/
include
/
llvm
/
Support
/
GraphWriter.h
diff --git
a/include/llvm/Support/GraphWriter.h
b/include/llvm/Support/GraphWriter.h
index eab0c9d18db1bc3a2328b8bade18a001409b447a..f178b0caa8aa9e26b177c942e7dd76f3ec45660d 100644
(file)
--- a/
include/llvm/Support/GraphWriter.h
+++ b/
include/llvm/Support/GraphWriter.h
@@
-172,7
+172,7
@@
public:
// If we should include the address of the node in the label, do so now.
if (DTraits.hasNodeAddressLabel(Node, G))
// If we should include the address of the node in the label, do so now.
if (DTraits.hasNodeAddressLabel(Node, G))
- O << "|" <<
(void*)Node
;
+ O << "|" <<
static_cast<const void*>(Node)
;
}
std::string edgeSourceLabels;
}
std::string edgeSourceLabels;
@@
-192,7
+192,7
@@
public:
// If we should include the address of the node in the label, do so now.
if (DTraits.hasNodeAddressLabel(Node, G))
// If we should include the address of the node in the label, do so now.
if (DTraits.hasNodeAddressLabel(Node, G))
- O << "|" <<
(void*)Node
;
+ O << "|" <<
static_cast<const void*>(Node)
;
}
if (DTraits.hasEdgeDestLabels()) {
}
if (DTraits.hasEdgeDestLabels()) {
@@
-296,26
+296,26
@@
public:
template<typename GraphType>
raw_ostream &WriteGraph(raw_ostream &O, const GraphType &G,
bool ShortNames = false,
template<typename GraphType>
raw_ostream &WriteGraph(raw_ostream &O, const GraphType &G,
bool ShortNames = false,
- const
std::string
&Title = "") {
+ const
Twine
&Title = "") {
// Start the graph emission process...
GraphWriter<GraphType> W(O, G, ShortNames);
// Emit the graph.
// Start the graph emission process...
GraphWriter<GraphType> W(O, G, ShortNames);
// Emit the graph.
- W.writeGraph(Title);
+ W.writeGraph(Title
.str()
);
return O;
}
template<typename GraphType>
return O;
}
template<typename GraphType>
-sys::Path WriteGraph(const GraphType &G, const
std::string
&Name,
- bool ShortNames = false, const
std::string
&Title = "") {
+sys::Path WriteGraph(const GraphType &G, const
Twine
&Name,
+ bool ShortNames = false, const
Twine
&Title = "") {
std::string ErrMsg;
sys::Path Filename = sys::Path::GetTemporaryDirectory(&ErrMsg);
if (Filename.isEmpty()) {
errs() << "Error: " << ErrMsg << "\n";
return Filename;
}
std::string ErrMsg;
sys::Path Filename = sys::Path::GetTemporaryDirectory(&ErrMsg);
if (Filename.isEmpty()) {
errs() << "Error: " << ErrMsg << "\n";
return Filename;
}
- Filename.appendComponent(
Name + ".dot"
);
+ Filename.appendComponent(
(Name + ".dot").str()
);
if (Filename.makeUnique(true,&ErrMsg)) {
errs() << "Error: " << ErrMsg << "\n";
return sys::Path();
if (Filename.makeUnique(true,&ErrMsg)) {
errs() << "Error: " << ErrMsg << "\n";
return sys::Path();
@@
-341,8
+341,8
@@
sys::Path WriteGraph(const GraphType &G, const std::string &Name,
/// then cleanup. For use from the debugger.
///
template<typename GraphType>
/// then cleanup. For use from the debugger.
///
template<typename GraphType>
-void ViewGraph(const GraphType &G, const
std::string
&Name,
- bool ShortNames = false, const
std::string
&Title = "",
+void ViewGraph(const GraphType &G, const
Twine
&Name,
+ bool ShortNames = false, const
Twine
&Title = "",
GraphProgram::Name Program = GraphProgram::DOT) {
sys::Path Filename = llvm::WriteGraph(G, Name, ShortNames, Title);
GraphProgram::Name Program = GraphProgram::DOT) {
sys::Path Filename = llvm::WriteGraph(G, Name, ShortNames, Title);