diff options
| author | Daniel Jasper <djasper@google.com> | 2013-02-01 11:28:16 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-02-01 11:28:16 +0000 |
| commit | 83d4e783b07483812d37f8266a3a539ac4246018 (patch) | |
| tree | 9ae4e44c513b4fa356e6beefaf7dea30663185a3 | |
| parent | 628df38e959584e4cb38ba8c8126dc1238701367 (diff) | |
| download | bcm5719-llvm-83d4e783b07483812d37f8266a3a539ac4246018.tar.gz bcm5719-llvm-83d4e783b07483812d37f8266a3a539ac4246018.zip | |
Hopefully fix windows build due to non-standard pair implementation.
llvm-svn: 174169
| -rw-r--r-- | clang/lib/Format/Format.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 03264993b98..d638221de63 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -595,7 +595,7 @@ private: // Insert start element into queue. std::multimap<unsigned, QueueItem> Queue; Queue.insert(std::pair<unsigned, QueueItem>( - 0, QueueItem(InitialState, Edge(false, NULL)))); + 0, QueueItem(InitialState, Edge(false, (const LineState *) 0)))); std::map<LineState, Edge> Seen; // While not empty, take first element and follow edges. |
