[Boost-commit] svn:boost r52072 - in sandbox-branches/andreo/guigl/libs/guigl: build/vc8ide example

Subject: [Boost-commit] svn:boost r52072 - in sandbox-branches/andreo/guigl/libs/guigl: build/vc8ide example
From: andreytorba_at_[hidden]
Date: 2009-03-30 17:00:47

Author: andreo
Date: 2009-03-30 17:00:46 EDT (Mon, 30 Mar 2009)
New Revision: 52072
URL: http://svn.boost.org/trac/boost/changeset/52072

Log:
deleted some warnings
Text files modified: 
   sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/build.vcproj |     4 ++--                                    
   sandbox-branches/andreo/guigl/libs/guigl/example/pch.hpp           |     5 ++++-                                   
   sandbox-branches/andreo/guigl/libs/guigl/example/polygon.cpp       |    18 ++++++++----------                      
   3 files changed, 14 insertions(+), 13 deletions(-)

Modified: sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/build.vcproj
==============================================================================
--- sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/build.vcproj	(original)
+++ sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/build.vcproj	2009-03-30 17:00:46 EDT (Mon, 30 Mar 2009)
@@ -26,7 +26,7 @@
                                 CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
                                 Output=""
                                 PreprocessorDefinitions=""
-				IncludeSearchPath="../../../../../ggl/boost/ggl"
+				IncludeSearchPath="../../../../../ggl/boost/ggl;"$(BOOST_ROOT)""
                                 ForcedIncludes=""
                                 AssemblySearchPath=""
                                 ForcedUsingAssemblies=""
@@ -46,7 +46,7 @@
                                 CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
                                 Output=""
                                 PreprocessorDefinitions=""
-				IncludeSearchPath="../../../../../ggl/boost/ggl"
+				IncludeSearchPath="../../../../../ggl/boost/ggl;"$(BOOST_ROOT)""
                                 ForcedIncludes=""
                                 AssemblySearchPath=""
                                 ForcedUsingAssemblies=""

Modified: sandbox-branches/andreo/guigl/libs/guigl/example/pch.hpp
==============================================================================
--- sandbox-branches/andreo/guigl/libs/guigl/example/pch.hpp	(original)
+++ sandbox-branches/andreo/guigl/libs/guigl/example/pch.hpp	2009-03-30 17:00:46 EDT (Mon, 30 Mar 2009)
@@ -3,4 +3,7 @@
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
 #include <boost/bind/placeholders.hpp>
-#include <boost/signal.hpp>
\ No newline at end of file
+#include <boost/signal.hpp>
+#include <boost/gil/utilities.hpp>
+#include <boost/gil/typedefs.hpp>
+#include <utility>

Modified: sandbox-branches/andreo/guigl/libs/guigl/example/polygon.cpp
==============================================================================
--- sandbox-branches/andreo/guigl/libs/guigl/example/polygon.cpp	(original)
+++ sandbox-branches/andreo/guigl/libs/guigl/example/polygon.cpp	2009-03-30 17:00:46 EDT (Mon, 30 Mar 2009)
@@ -53,8 +53,7 @@
 
     void init()
     {
-        box_2d b(make<point_2d>(150, 150), make<point_2d>(450, 250));
-        cb = b;
+        cb = make<box_2d>(150, 150, 450, 250);
 
         const double coor[][2] = {
             {200, 130}, {240, 170}, {280, 180}, {340, 120}, {370, 160},
@@ -77,10 +76,9 @@
 
     void on_mouse_move()
     {
-        box_2d box(
-            make<point_2d>(mouse_state().position.x - 100, mouse_state().position.y - 50),
-            make<point_2d>(mouse_state().position.x + 100, mouse_state().position.y + 50));
-        cb = box;
+        cb = make<box_2d>(
+            mouse_state().position.x - 100, mouse_state().position.y - 50,
+            mouse_state().position.x + 100, mouse_state().position.y + 50);
 
         v.clear();
         intersection(cb, poly, std::back_inserter(v));
@@ -128,20 +126,20 @@
         glEnable(GL_POINT_SMOOTH);
 
         // hull
-        draw_polygon(hull, yellow(0.3), red(0.4));
+        draw_polygon(hull, yellow(0.3f), red(0.4f));
 
         // polygon
-        draw_polygon(poly, yellow(0.8), red(0.8));
+        draw_polygon(poly, yellow(0.8f), red(0.8f));
 
         // box
-        gl::color(blue(0.2));
+        gl::color(blue(0.2f));
         ggl::rect(cb);
 
         gl::point_size(10);
         // intersection
         BOOST_FOREACH(polygon_2d const& pg, v)
         {
-            draw_polygon(pg, red(0.4), black(0.8));
+            draw_polygon(pg, red(0.4f), black(0.8f));
             geometry::for_each_point(pg, ggl::drawer());
         }