tianqi22 / monav

Automatically exported from code.google.com/p/monav
0 stars 0 forks source link

First patch for Symbian compilation #43

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago
Here is a first patch for compiling monav on Symbian.

Index: plugins/gpsgrid/cell.h
===================================================================
--- plugins/gpsgrid/cell.h  (revision 467)
+++ plugins/gpsgrid/cell.h  (working copy)
@@ -170,8 +170,8 @@

            std::vector< UnsignedCoordinate > nodeCoordinates( nodes.size() );
            for ( std::vector< Edge >::iterator i = edges.begin(), e = edges.end(); i != e; ++i ) {
-               unsigned sourcePos = lower_bound( nodes.begin(), nodes.end(), i->source ) 
- nodes.begin();
-               unsigned targetPos = lower_bound( nodes.begin(), nodes.end(), i->target ) 
- nodes.begin();
+                unsigned sourcePos = std::lower_bound( nodes.begin(), 
nodes.end(), i->source ) - nodes.begin();
+                unsigned targetPos = std::lower_bound( nodes.begin(), 
nodes.end(), i->target ) - nodes.begin();
                nodeCoordinates[sourcePos] = coordinates[i->pathID];
                nodeCoordinates[targetPos] = coordinates[i->pathID + i->pathLength - 1];
            }
@@ -238,8 +238,8 @@
            }

            for ( std::vector< Edge >::iterator i = edges.begin(), iend = edges.end(); i != iend; i++ ) {
-               unsigned sourcePos = lower_bound( nodes.begin(), nodes.end(), i->source ) 
- nodes.begin();
-               unsigned targetPos = lower_bound( nodes.begin(), nodes.end(), i->target ) 
- nodes.begin();
+                unsigned sourcePos = std::lower_bound( nodes.begin(), 
nodes.end(), i->source ) - nodes.begin();
+                unsigned targetPos = std::lower_bound( nodes.begin(), 
nodes.end(), i->target ) - nodes.begin();
                if ( coordinates.size() == 0 || coordinates.back().x != nodeCoordinates[sourcePos].x || coordinates.back().y != nodeCoordinates[sourcePos].y )
                    coordinates.push_back( nodeCoordinates[sourcePos] );
                i->pathID = coordinates.size() - 1;
Index: plugins/osmrenderer/qtilerendererclient.cpp
===================================================================
--- plugins/osmrenderer/qtilerendererclient.cpp (revision 467)
+++ plugins/osmrenderer/qtilerendererclient.cpp (working copy)
@@ -40,7 +40,7 @@
         if(t1.z>t2.z) return true;
         return false;
     };
-    bool operator==(const struct tileref &t) {
+    bool operator==(const struct tileref &t) const {
         return(x==t.x && y==t.y && z==t.z);
     };
 };

Original issue reported on code.google.com by christia...@gmail.com on 31 Mar 2011 at 1:11

GoogleCodeExporter commented 9 years ago
Thanks, integrated it in r468.

Original comment by veaac.fd...@gmail.com on 31 Mar 2011 at 6:32