r174169 - Hopefully fix windows build due to non-standard pair implementation.

Daniel Jasper djasper at google.com
Fri Feb 1 03:28:16 PST 2013


Author: djasper
Date: Fri Feb  1 05:28:16 2013
New Revision: 174169

URL: http://llvm.org/viewvc/llvm-project?rev=174169&view=rev
Log:
Hopefully fix windows build due to non-standard pair implementation.

Modified:
    cfe/trunk/lib/Format/Format.cpp

Modified: cfe/trunk/lib/Format/Format.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=174169&r1=174168&r2=174169&view=diff
==============================================================================
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Fri Feb  1 05:28:16 2013
@@ -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.





More information about the cfe-commits mailing list