[Scummvm-cvs-logs] SF.net SVN: scummvm:[49616] tools/branches/gsoc2010-decompiler/decompiler

[pidgeot at users.sourceforge.net]

Revision: 49616
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49616&view=rev
Author:   pidgeot
Date:     2010-06-13 00:41:30 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Fix name of member variable CodeFlow::g

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/decompiler/control_flow.cpp
    tools/branches/gsoc2010-decompiler/decompiler/control_flow.h

Modified: tools/branches/gsoc2010-decompiler/decompiler/control_flow.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/control_flow.cpp	2010-06-13 00:11:10 UTC (rev 49615)
+++ tools/branches/gsoc2010-decompiler/decompiler/control_flow.cpp	2010-06-13 00:41:30 UTC (rev 49616)
@@ -27,11 +27,11 @@
 
 	std::map<uint32, GraphVertex> addrMap;
 	for (InstIterator it = insts.begin(); it != insts.end(); ++it) {
-		GraphVertex cur = boost::add_vertex(g);
-		boost::put(boost::vertex_name, g, cur, Group(it, it));
+		GraphVertex cur = boost::add_vertex(_g);
+		boost::put(boost::vertex_name, _g, cur, Group(it, it));
 
 		if (it != insts.begin())
-			boost::add_edge(last, cur, g);
+			boost::add_edge(last, cur, _g);
 		last = cur;
 	}
 }
@@ -40,5 +40,5 @@
 }
 
 const Graph &ControlFlow::analyze() {
-	return g;
+	return _g;
 }

Modified: tools/branches/gsoc2010-decompiler/decompiler/control_flow.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/control_flow.h	2010-06-13 00:11:10 UTC (rev 49615)
+++ tools/branches/gsoc2010-decompiler/decompiler/control_flow.h	2010-06-13 00:41:30 UTC (rev 49616)
@@ -30,7 +30,7 @@
  */
 class ControlFlow {
 private:
-	Graph g; ///< The control flow graph.
+	Graph _g; ///< The control flow graph.
 
 public:
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.