[Boost-commit] svn:boost r45161 - in sandbox/memory: boost/memory libs/memory/test/test_basic

From: xushiweizh_at_[hidden]
Date: 2008-05-05 21:49:03

Author: xushiwei
Date: 2008-05-05 21:49:02 EDT (Mon, 05 May 2008)
New Revision: 45161
URL: http://svn.boost.org/trac/boost/changeset/45161

Log:
vs2005
Text files modified: 
   sandbox/memory/boost/memory/gc_alloc.hpp               |     2 +-                                      
   sandbox/memory/libs/memory/test/test_basic/test.vcproj |     8 ++++----                                
   2 files changed, 5 insertions(+), 5 deletions(-)

Modified: sandbox/memory/boost/memory/gc_alloc.hpp
==============================================================================
--- sandbox/memory/boost/memory/gc_alloc.hpp	(original)
+++ sandbox/memory/boost/memory/gc_alloc.hpp	2008-05-05 21:49:02 EDT (Mon, 05 May 2008)
@@ -442,7 +442,7 @@
                         m_end = pNew->end();
                 }
 
-		BOOST_MEMORY_ASSERT(m_end - m_begin >= cb);
+		BOOST_MEMORY_ASSERT((size_t)(m_end - m_begin) >= cb);
 
                 MemHeader* pAlloc = (MemHeader*)(m_end -= cb);
                 pAlloc->nodeType = nodeAlloced;

Modified: sandbox/memory/libs/memory/test/test_basic/test.vcproj
==============================================================================
--- sandbox/memory/libs/memory/test/test_basic/test.vcproj	(original)
+++ sandbox/memory/libs/memory/test/test_basic/test.vcproj	2008-05-05 21:49:02 EDT (Mon, 05 May 2008)
@@ -44,7 +44,7 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../"
+				AdditionalIncludeDirectories="../../../../"
                                 PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
                                 StringPooling="true"
                                 RuntimeLibrary="2"
@@ -73,7 +73,7 @@
                                 OutputFile=".\Release/test.exe"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../lib"
+				AdditionalLibraryDirectories="../../lib"
                                 GenerateDebugInformation="true"
                                 ProgramDatabaseFile=".\Release/test.pdb"
                                 SubSystem="1"
@@ -136,7 +136,7 @@
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-				AdditionalIncludeDirectories="../../../"
+				AdditionalIncludeDirectories="../../../../"
                                 PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -165,7 +165,7 @@
                                 OutputFile=".\Debug/test.exe"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../lib"
+				AdditionalLibraryDirectories="../../lib"
                                 GenerateDebugInformation="true"
                                 ProgramDatabaseFile=".\Debug/test.pdb"
                                 SubSystem="1"