[GpsDrive-svn] SF.net SVN: gpsdrive:[2609] trunk/src/mapnik.cpp

[<hb...@us...>]

Revision: 2609
          http://gpsdrive.svn.sourceforge.net/gpsdrive/?rev=2609&view=rev
Author:   hbowman
Date:     2012-05-19 13:31:28 +0000 (Sat, 19 May 2012)
Log Message:
-----------
make compatible with modern Boost::filesystem API  see http://www.boost.org/doc/libs/1_46_1/libs/filesystem/v2/doc/index.htm#Deprecated-names

Modified Paths:
--------------
    trunk/src/mapnik.cpp

Modified: trunk/src/mapnik.cpp
===================================================================
--- trunk/src/mapnik.cpp	2012-05-19 12:37:44 UTC (rev 2608)
+++ trunk/src/mapnik.cpp	2012-05-19 13:31:28 UTC (rev 2609)
@@ -217,19 +217,20 @@
         try {
 
             if ( boost::filesystem::is_regular( dir_itr->status() ) ) {
-#if BOOST_VERSION < 103600
-                if (mydebug > 10) cout << "freetype_engine::register_font(" << dir_itr->leaf() << ")" << endl;
-#else
-                if (mydebug > 10) cout << "freetype_engine::register_font(" << dir_itr->filename() << ")" << endl;
-#endif
-                freetype_engine::register_font( dir_itr->string() );
-            }
-        } catch ( const std::exception & ex ) {
-#if BOOST_VERSION < 103600
-            std::cout << dir_itr->leaf() << " " << ex.what() << std::endl;
-#else
-            std::cout << dir_itr->filename() << " " << ex.what() << std::endl;
-#endif
+//http://www.boost.org/doc/libs/1_46_1/libs/filesystem/v2/doc/index.htm
+#if BOOST_FILESYSTEM_VERSION < 3
+		if (mydebug > 10) cout << "freetype_engine::register_font(" << dir_itr->leaf() << ")" << endl;
+		freetype_engine::register_font( dir_itr->string() );
+	    }
+	} catch ( const std::exception & ex ) {
+	    std::cout << dir_itr->leaf() << " " << ex.what() << std::endl;
+#else           
+		if (mydebug > 10) cout << "freetype_engine::register_font(" << dir_itr->path().filename() << ")" << endl;
+		freetype_engine::register_font( dir_itr->path().string() );
+	    }
+	} catch ( const std::exception & ex ) {
+	    std::cout << dir_itr->path().filename() << " " << ex.what() << std::endl;
+#endif  
         }
 
     }

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