From 159b96c1a166200ad8ff1eea91303c604b60ff7d Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Tue, 25 May 2010 19:41:18 +0000 Subject: [PATCH] MSVC warning fixes This was SVN commit r7585. --- source/lib/allocators/pool.h | 5 +++++ source/lib/precompiled.h | 1 + 2 files changed, 6 insertions(+) diff --git a/source/lib/allocators/pool.h b/source/lib/allocators/pool.h index 8f1e869fbd..f6bfcd20f8 100644 --- a/source/lib/allocators/pool.h +++ b/source/lib/allocators/pool.h @@ -247,6 +247,10 @@ public: { } + pool_allocator& operator=(const pool_allocator&) throw () + { + } + pointer address(reference r) { return &r; @@ -270,6 +274,7 @@ public: void destroy(const pointer ptr) { ptr->~T(); + UNUSED2(ptr); // silence MSVC warnings } pointer allocate(size_type n) diff --git a/source/lib/precompiled.h b/source/lib/precompiled.h index 471b14c8ff..47ae142da5 100644 --- a/source/lib/precompiled.h +++ b/source/lib/precompiled.h @@ -54,6 +54,7 @@ # pragma warning(disable:4786) // identifier truncated to 255 chars # pragma warning(disable:4351) // yes, default init of array entries is desired # pragma warning(disable:4355) // 'this' used in base member initializer list +# pragma warning(disable:4718) // recursive call has no side effects, deleting // .. disabled only for the precompiled headers # pragma warning(disable:4702) // unreachable code (frequent in STL) // .. VS2005 code analysis (very frequent ones)