[Boost-commit] svn:boost r46523 - in sandbox/memory: boost/memory boost/memory/thread libs/memory

From: xushiweizh_at_[hidden]
Date: 2008-06-19 11:42:38

Author: xushiwei
Date: 2008-06-19 11:42:38 EDT (Thu, 19 Jun 2008)
New Revision: 46523
URL: http://svn.boost.org/trac/boost/changeset/46523

Log:
warning all
Text files modified: 
   sandbox/memory/boost/memory/basic.hpp        |     2 ++                                      
   sandbox/memory/boost/memory/gc_alloc.hpp     |     4 +++-                                    
   sandbox/memory/boost/memory/thread/tls.hpp   |     2 ++                                      
   sandbox/memory/boost/memory/tls_gc_alloc.hpp |     4 ++--                                    
   sandbox/memory/libs/memory/memory.prj.li     |     6 +++---                                  
   5 files changed, 12 insertions(+), 6 deletions(-)

Modified: sandbox/memory/boost/memory/basic.hpp
==============================================================================
--- sandbox/memory/boost/memory/basic.hpp	(original)
+++ sandbox/memory/boost/memory/basic.hpp	2008-06-19 11:42:38 EDT (Thu, 19 Jun 2008)
@@ -31,7 +31,9 @@
 #endif
 
 #pragma pack() // default pack
+#if defined(_MSC_VER)
 #pragma warning(disable:4786)
+#endif
 // warning: identifier was truncated to '255' characters in the debug information
 
 // =========================================================================

Modified: sandbox/memory/boost/memory/gc_alloc.hpp
==============================================================================
--- sandbox/memory/boost/memory/gc_alloc.hpp	(original)
+++ sandbox/memory/boost/memory/gc_alloc.hpp	2008-06-19 11:42:38 EDT (Thu, 19 Jun 2008)
@@ -12,7 +12,9 @@
 #ifndef BOOST_MEMORY_GC_ALLOC_HPP
 #define BOOST_MEMORY_GC_ALLOC_HPP
 
+#if defined(_MSC_VER)
 #pragma warning(disable:4786)
+#endif
 
 #ifndef BOOST_MEMORY_SCOPED_ALLOC_HPP
 #include "scoped_alloc.hpp"
@@ -81,7 +83,7 @@
                 // HeaderSizeT cbNodeSize : 30; // cbNodeSize = cbSize + sizeof(MemHeader)
                 // HeaderSizeT nodeType : 2;	// enum MemNodeType
                 
-		HeaderSizeT BOOST_MEMORY_CALL getNodeType() const {
+		int BOOST_MEMORY_CALL getNodeType() const {
                         return NodeTypeMask & dataMemHeader;
                 }
                 HeaderSizeT BOOST_MEMORY_CALL getNodeSize() const {

Modified: sandbox/memory/boost/memory/thread/tls.hpp
==============================================================================
--- sandbox/memory/boost/memory/thread/tls.hpp	(original)
+++ sandbox/memory/boost/memory/thread/tls.hpp	2008-06-19 11:42:38 EDT (Thu, 19 Jun 2008)
@@ -141,7 +141,9 @@
         }
 };
 
+#if defined(_MSC_VER)
 #pragma warning(disable:4786)
+#endif
 
 template <
         class Type, 

Modified: sandbox/memory/boost/memory/tls_gc_alloc.hpp
==============================================================================
--- sandbox/memory/boost/memory/tls_gc_alloc.hpp	(original)
+++ sandbox/memory/boost/memory/tls_gc_alloc.hpp	2008-06-19 11:42:38 EDT (Thu, 19 Jun 2008)
@@ -53,12 +53,12 @@
 
         static void* BOOST_MEMORY_CALL allocate(const size_t cbData)
         {
-		_tls_gcAlloc->get().allocate(cbData);
+		return _tls_gcAlloc->get().allocate(cbData);
         }
 
         static void* BOOST_MEMORY_CALL allocate(const size_t cbData0, destructor_t fn)
         {
-		_tls_gcAlloc->get().allocate(cbData0, fn);
+		return _tls_gcAlloc->get().allocate(cbData0, fn);
         }
 
         static void* BOOST_MEMORY_CALL allocate(size_t cb, int fnZero)

Modified: sandbox/memory/libs/memory/memory.prj.li
==============================================================================
--- sandbox/memory/libs/memory/memory.prj.li	(original)
+++ sandbox/memory/libs/memory/memory.prj.li	2008-06-19 11:42:38 EDT (Thu, 19 Jun 2008)
@@ -4,14 +4,14 @@
 
 [Config Release]
 Product		Dll bin/linux/boost-memory
-Options		Release; MultiThread; AnsiChar; NoRtti; Exception
+Options		Release; MultiThread; AnsiChar; NoRtti; Exception; WarningAll
 ObjDir		LRelease
 LibDir		
 Libraries	pthread
 
 [Config ReleaseCS]
 Product		Dll bin/linux/boost-memory-cs
-Options		Release; MultiThread; AnsiChar; NoRtti; Exception
+Options		Release; MultiThread; AnsiChar; NoRtti; Exception; WarningAll
 Defines		BOOST_MEMORY_NO_LOCKFREE
 ObjDir		LReleaseCS
 LibDir		
@@ -19,7 +19,7 @@
 
 [Config Debug]
 Product		Dll bin/linuxd/boost-memory
-Options		Debug; MultiThread; AnsiChar; NoRtti; Exception
+Options		Debug; MultiThread; AnsiChar; NoRtti; Exception; WarningAll
 ObjDir		LDebug
 LibDir		
 Libraries	pthread