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 | 67581942138bb5ce25bcf3a67fff278ca4fa5f7d (patch) | |
tree | b3eeb3682f3f31868def11e637e1ed9b916b4337 /lib/Format/Format.cpp | |
parent | 68ef0df17ed6de26084c3a11a4cabbd69a5a2465 (diff) |
Hopefully fix windows build due to non-standard pair implementation.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174169 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/Format.cpp')
-rw-r--r-- | lib/Format/Format.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 03264993b9..d638221de6 100644 --- a/lib/Format/Format.cpp +++ b/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. |