Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r61528 - in sandbox/geometry/libs/geometry/test: algorithms algorithms/overlay/robustness extensions/algorithms extensions/gis/io/wkb extensions/gis/io/wkt extensions/gis/latlong extensions/gis/projections extensions/index extensions/nsphere
From: barend.gehrels_at_[hidden]
Date: 2010-04-24 08:13:08


Author: barendgehrels
Date: 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
New Revision: 61528
URL: http://svn.boost.org/trac/boost/changeset/61528

Log:
vcproj fixes
extension fixes (in tests, in nsphere headers)

Text files modified:
   sandbox/geometry/libs/geometry/test/algorithms/intersection.cpp | 2 +-
   sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp | 6 ++++++
   sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.vcproj | 3 +--
   sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.vcproj | 2 +-
   sandbox/geometry/libs/geometry/test/extensions/algorithms/connect.vcproj | 1 +
   sandbox/geometry/libs/geometry/test/extensions/algorithms/offset.vcproj | 1 +
   sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.cpp | 2 +-
   sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.vcproj | 1 +
   sandbox/geometry/libs/geometry/test/extensions/gis/io/wkb/read_wkb.vcproj | 9 +++++----
   sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp | 2 +-
   sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.vcproj | 9 +++++----
   sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp | 2 +-
   sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.vcproj | 9 +++++----
   sandbox/geometry/libs/geometry/test/extensions/gis/latlong/andoyer.vcproj | 9 +++++----
   sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.vcproj | 5 +++--
   sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.vcproj | 6 ++++--
   sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse.vcproj | 4 ++--
   sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse_dms.vcproj | 9 +++++----
   sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.vcproj | 9 +++++----
   sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp | 1 -
   sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.vcproj | 5 +++--
   sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp | 1 -
   sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.vcproj | 5 +++--
   sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp | 4 +---
   sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.vcproj | 7 ++++---
   sandbox/geometry/libs/geometry/test/extensions/index/rtree.vcproj | 13 +++++++++----
   sandbox/geometry/libs/geometry/test/extensions/nsphere/area.cpp | 3 +++
   sandbox/geometry/libs/geometry/test/extensions/nsphere/area.vcproj | 5 +++--
   sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.cpp | 7 -------
   sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.vcproj | 10 ++++++----
   sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp | 1 +
   sandbox/geometry/libs/geometry/test/extensions/nsphere/within.vcproj | 5 +++--
   32 files changed, 90 insertions(+), 68 deletions(-)

Modified: sandbox/geometry/libs/geometry/test/algorithms/intersection.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/intersection.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/intersection.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -173,6 +173,7 @@
         intersect_exterior_and_interiors_winded[0], intersect_exterior_and_interiors_winded[1],
         1, 14, 25.2166667);
 
+ return;
 
 
     test_one<polygon, polygon, polygon>(
@@ -188,7 +189,6 @@
             5, 22, 1.190171);
 
 
- return;
 
 
     /*

Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -14,6 +14,12 @@
 #define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
 #define BOOST_GEOMETRY_NO_BOOST_TEST
 
+// For mixing int/float
+#if defined(_MSC_VER)
+#pragma warning( disable : 4244 )
+#endif
+
+
 #include <boost/timer.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/random/linear_congruential.hpp>

Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -119,7 +119,7 @@
                                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
                                 RuntimeLibrary="0"
                                 UsePrecompiledHeader="0"
- WarningLevel="0"
+ WarningLevel="3"
                                 Detect64BitPortabilityProblems="true"
                         />
                         <Tool
@@ -133,7 +133,6 @@
                         />
                         <Tool
                                 Name="VCLinkerTool"
- GenerateDebugInformation="true"
                                 SubSystem="1"
                                 OptimizeReferences="2"
                                 EnableCOMDATFolding="2"

Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -119,7 +119,7 @@
                                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
                                 RuntimeLibrary="0"
                                 UsePrecompiledHeader="0"
- WarningLevel="0"
+ WarningLevel="3"
                                 Detect64BitPortabilityProblems="true"
                         />
                         <Tool

Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/connect.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/connect.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/connect.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -46,6 +46,7 @@
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"

Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/offset.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/offset.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/offset.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -46,6 +46,7 @@
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"

Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -6,12 +6,12 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <iostream>
-#include <iomanip>
 #include <string>
 
 
 #include <geometry_test_common.hpp>
 
+#include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 
 #include <boost/geometry/extensions/algorithms/remove_spikes.hpp>

Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -46,6 +46,7 @@
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/io/wkb/read_wkb.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/io/wkb/read_wkb.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/io/wkb/read_wkb.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -20,7 +20,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\read_wkb"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\..\boost.vsprops"
                         CharacterSet="1"
>
                         <Tool
@@ -41,11 +41,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="../../..//../../..;../../../.."
+ AdditionalIncludeDirectories="../../../../../../..;../../../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -92,7 +93,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\read_wkb"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
>
@@ -113,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..//../../..;../../../.."
+ AdditionalIncludeDirectories="../../../../../../..;../../../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -51,7 +51,7 @@
 
     test_wkt<multi_point<P> >("multipoint((1 2),(3 4))", 2);
     test_wkt<multi_linestring<linestring<P> > >("multilinestring((1 1,2 2,3 3),(4 4,5 5,6 6))", 6, 4 * sqrt(2.0));
- test_wkt<multi_polygon<polygon<P> > >("multipolygon(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))", 15, 0, 19, 28);
+ test_wkt<multi_polygon<polygon<P> > >("multipolygon(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))", 15, 0, 21, 28);
 
     test_wrong_wkt<multi_polygon<polygon<P> > >(
         "MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),(0 0,0 4,4 4,4 0,0 0)))",

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -20,7 +20,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\multi_wkt"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\..\boost.vsprops"
                         CharacterSet="1"
>
                         <Tool
@@ -41,11 +41,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="../../..//../../..;../../../.."
+ AdditionalIncludeDirectories="../../../../../../..;../../../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -92,7 +93,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\multi_wkt"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
>
@@ -113,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..//../../..;../../../.."
+ AdditionalIncludeDirectories="../../../../../../..;../../../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -124,7 +124,7 @@
     test_wkt<P >("POINT(1 2)", 1);
     test_wkt<linestring<P> >("LINESTRING(1 1,2 2,3 3)", 3, 2 * sqrt(2.0));
     test_wkt<polygon<P> >("POLYGON((0 0,0 4,4 4,4 0,0 0)"
- ",(1 1,1 2,2 2,2 1,1 1),(1 1,1 2,2 2,2 1,1 1))", 15, 0, 14, 24);
+ ",(1 1,1 2,2 2,2 1,1 1),(1 1,1 2,2 2,2 1,1 1))", 15, 0, 18, 24);
 
     // Non OGC: a box defined by a polygon
     //test_wkt<box<P> >("POLYGON((0 0,0 1,1 1,1 0,0 0))", 4, 0, 1, 4);

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/io/wkt/wkt.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -20,7 +20,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\wkt"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\..\boost.vsprops"
                         CharacterSet="1"
>
                         <Tool
@@ -41,11 +41,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="../../..//../../..;../../../.."
+ AdditionalIncludeDirectories="../../../../../../..;../../../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -92,7 +93,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\wkt"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
>
@@ -113,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..//../../..;../../../.."
+ AdditionalIncludeDirectories="../../../../../../..;../../../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/andoyer.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/andoyer.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/andoyer.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -20,7 +20,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\andoyer"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
>
                         <Tool
@@ -41,11 +41,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -92,7 +93,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\andoyer"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
>
@@ -113,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -41,11 +41,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -113,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -40,11 +40,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX"
                                 BasicRuntimeChecks="3"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -111,9 +112,10 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NOMINMAX"
                                 UsePrecompiledHeader="0"
+ WarningLevel="3"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -42,7 +42,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 RuntimeLibrary="1"
                                 ExceptionHandling="2"
@@ -112,7 +112,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse_dms.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse_dms.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/parse_dms.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -20,7 +20,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\parse_dms"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
>
                         <Tool
@@ -41,11 +41,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -92,7 +93,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\parse_dms"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
>
@@ -113,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -19,8 +19,8 @@
                         Name="Debug|Win32"
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\point_ll"
- InheritedPropertySheets="../../../boost.vsprops"
                         ConfigurationType="1"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
>
                         <Tool
@@ -41,11 +41,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -91,8 +92,8 @@
                         Name="Release|Win32"
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\point_ll"
- InheritedPropertySheets="../../../boost.vsprops"
                         ConfigurationType="1"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
>
@@ -113,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../..//../../..;../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -9,7 +9,6 @@
 
 #if defined(_MSC_VER)
 #pragma warning( disable : 4305 ) // truncation double -> float
-#pragma warning( disable : 4244 ) // loss of data
 #endif // defined(_MSC_VER)
 
 

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -20,7 +20,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\projection"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
>
                         <Tool
@@ -47,6 +47,7 @@
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -93,7 +94,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\projection"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
>

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -8,7 +8,6 @@
 
 #if defined(_MSC_VER)
 #pragma warning( disable : 4305 ) // truncation double -> float
-#pragma warning( disable : 4244 ) // loss of data
 #endif // defined(_MSC_VER)
 
 

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -20,7 +20,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\projection_epsg"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
>
                         <Tool
@@ -47,6 +47,7 @@
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -93,7 +94,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\projection_epsg"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
>

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -11,8 +11,6 @@
 
 #if defined(_MSC_VER)
 #pragma warning( disable : 4305 ) // truncation double -> float
-#pragma warning( disable : 4244 ) // loss of data
-#pragma warning( disable : 4996 ) // loss of data
 #endif // defined(_MSC_VER)
 
 
@@ -353,7 +351,7 @@
     //test_all<boost::geometry::point_xy<float> >();
     //test_all<boost::geometry::point_xy<double> >();
 
- // Leave onlye one here, because this divides compilation time with 6 or 7
+ // Leave only one here, because this divides compilation time with 6 or 7
     test_all<boost::geometry::point_xy<long double> >();
 
     return 0;

Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -20,7 +20,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\projections"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
>
                         <Tool
@@ -47,6 +47,7 @@
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -59,6 +60,7 @@
                         />
                         <Tool
                                 Name="VCLinkerTool"
+ GenerateDebugInformation="true"
                                 SubSystem="1"
                                 TargetMachine="1"
                         />
@@ -92,7 +94,7 @@
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\projections"
                         ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
>
@@ -130,7 +132,6 @@
                         />
                         <Tool
                                 Name="VCLinkerTool"
- GenerateDebugInformation="true"
                                 SubSystem="1"
                                 OptimizeReferences="2"
                                 EnableCOMDATFolding="2"

Modified: sandbox/geometry/libs/geometry/test/extensions/index/rtree.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/index/rtree.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/index/rtree.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -6,7 +6,6 @@
         ProjectGUID="{5542B923-D429-4393-968F-E62DDCE4B87C}"
         RootNamespace="rtree"
         Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
>
         <Platforms>
                 <Platform
@@ -42,10 +41,10 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="..//../../..;../.."
+ AdditionalIncludeDirectories="../../../../..;../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- RuntimeLibrary="1"
                                 ExceptionHandling="2"
+ RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
                                 DebugInformationFormat="1"
                         />
@@ -83,6 +82,9 @@
                                 Name="VCAppVerifierTool"
                         />
                         <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
                                 Name="VCPostBuildEventTool"
                         />
                 </Configuration>
@@ -112,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..//../../..;../.."
+ AdditionalIncludeDirectories="../../../../..;../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"
@@ -152,6 +154,9 @@
                                 Name="VCAppVerifierTool"
                         />
                         <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
                                 Name="VCPostBuildEventTool"
                         />
                 </Configuration>

Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/area.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/area.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/area.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -7,6 +7,9 @@
 
 #include <geometry_test_common.hpp>
 
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
+
 #include <boost/geometry/extensions/nsphere/algorithms/area.hpp>
 #include <boost/geometry/extensions/nsphere/geometries/nsphere.hpp>
 

Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/area.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/area.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/area.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -41,11 +41,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="..//../../..;../.."
+ AdditionalIncludeDirectories="../../../../..;../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -113,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..//../../..;../.."
+ AdditionalIncludeDirectories="../../../../..;../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -5,13 +5,6 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#if defined(_MSC_VER)
-// We deliberately mix float/double's here so turn off warnings
-#pragma warning( disable : 4244 )
-#pragma warning( disable : 4305 )
-#endif // defined(_MSC_VER)
-
-
 
 #include <geometry_test_common.hpp>
 

Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/circle.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -19,8 +19,8 @@
                         Name="Debug|Win32"
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\circle"
- InheritedPropertySheets="../../boost.vsprops"
                         ConfigurationType="1"
+ InheritedPropertySheets="..\..\boost.vsprops"
                         CharacterSet="1"
>
                         <Tool
@@ -41,11 +41,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="..//../../..;../.."
+ AdditionalIncludeDirectories="../../../../..;../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -58,6 +59,7 @@
                         />
                         <Tool
                                 Name="VCLinkerTool"
+ GenerateDebugInformation="true"
                                 SubSystem="1"
                                 TargetMachine="1"
                         />
@@ -90,8 +92,8 @@
                         Name="Release|Win32"
                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                         IntermediateDirectory="$(ConfigurationName)\circle"
- InheritedPropertySheets="../../boost.vsprops"
                         ConfigurationType="1"
+ InheritedPropertySheets="..\..\boost.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
>
@@ -112,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..//../../..;../.."
+ AdditionalIncludeDirectories="../../../../..;../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"

Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -10,6 +10,7 @@
 #include <boost/geometry/extensions/nsphere/nsphere.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
 
 #include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
 

Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/within.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/within.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/within.vcproj 2010-04-24 08:13:05 EDT (Sat, 24 Apr 2010)
@@ -41,11 +41,12 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
- AdditionalIncludeDirectories="..//../../..;../.."
+ AdditionalIncludeDirectories="../../../../..;../.."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="1"
                                 UsePrecompiledHeader="0"
+ DebugInformationFormat="1"
                         />
                         <Tool
                                 Name="VCManagedResourceCompilerTool"
@@ -113,7 +114,7 @@
                         />
                         <Tool
                                 Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..//../../..;../.."
+ AdditionalIncludeDirectories="../../../../..;../.."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 ExceptionHandling="2"
                                 UsePrecompiledHeader="0"


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk