From: François Dumont <fdumont@gcc.gnu.org>
Date: Fri, 2 Sep 2011 15:54:16 +0000 (+0000)
Subject: testsuite_allocator.h (tracker_allocator_counter:: allocate): Update allocation count... 
X-Git-Tag: releases/gcc-4.7.0~3992
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1f3ce0db179a9c602c4699c517d9c689ebce34f;p=thirdparty%2Fgcc.git

testsuite_allocator.h (tracker_allocator_counter:: allocate): Update allocation count only if allocation succeeded.

2011-09-02  François Dumont  <fdumont@gcc.gnu.org>

	* testsuite/util/testsuite_allocator.h (tracker_allocator_counter::
	allocate): Update allocation count only if allocation succeeded.

From-SVN: r178486
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d655cc4dd578..5d34b2b419f7 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-02  François Dumont  <fdumont@gcc.gnu.org>
+
+	* testsuite/util/testsuite_allocator.h (tracker_allocator_counter::
+	allocate): Update allocation count only if allocation succeeded.
+
 2011-09-02  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/std/bitset: Trivial formatting fixes.
diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h
index 279c42d1a30a..57a5a8ae896e 100644
--- a/libstdc++-v3/testsuite/util/testsuite_allocator.h
+++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h
@@ -37,14 +37,15 @@ namespace __gnu_test
   {
   public:
     typedef std::size_t    size_type; 
-    
+
     static void*
     allocate(size_type blocksize)
     {
+      void* p = ::operator new(blocksize);
       allocationCount_ += blocksize;
-      return ::operator new(blocksize);
+      return p;
     }
-    
+
     static void
     construct() { constructCount_++; }
 
@@ -57,19 +58,19 @@ namespace __gnu_test
       ::operator delete(p);
       deallocationCount_ += blocksize;
     }
-    
+
     static size_type
     get_allocation_count() { return allocationCount_; }
-    
+
     static size_type
     get_deallocation_count() { return deallocationCount_; }
-    
+
     static int
     get_construct_count() { return constructCount_; }
 
     static int
     get_destruct_count() { return destructCount_; }
-    
+
     static void
     reset()
     {