Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r81304 - sandbox-branches/geometry/index_dev/test/rtree
From: adam.wulkiewicz_at_[hidden]
Date: 2012-11-11 21:36:43


Author: awulkiew
Date: 2012-11-11 21:36:41 EST (Sun, 11 Nov 2012)
New Revision: 81304
URL: http://svn.boost.org/trac/boost/changeset/81304

Log:
exceptions test compilation warnings fixed for clang

Text files modified:
   sandbox-branches/geometry/index_dev/test/rtree/rtree_exceptions.cpp | 8 --------
   sandbox-branches/geometry/index_dev/test/rtree/test_rtree_exceptions.hpp | 6 +++---
   2 files changed, 3 insertions(+), 11 deletions(-)

Modified: sandbox-branches/geometry/index_dev/test/rtree/rtree_exceptions.cpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/rtree_exceptions.cpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/rtree_exceptions.cpp 2012-11-11 21:36:41 EST (Sun, 11 Nov 2012)
@@ -38,10 +38,6 @@
     }
 }
 
-//#define _CRTDBG_MAP_ALLOC
-//#include <stdlib.h>
-//#include <crtdbg.h>
-
 int test_main(int, char* [])
 {
     test_rtree_value_exceptions< bgi::linear<4, 2> >();
@@ -51,9 +47,5 @@
     test_rtree_value_exceptions< bgi::rstar<4, 2> >();
     test_rtree_value_exceptions(bgi::runtime::rstar(4, 2));
 
- //std::cout << "----------------------------------------\n";
- //_CrtDumpMemoryLeaks();
- //std::cin.get();
-
     return 0;
 }

Modified: sandbox-branches/geometry/index_dev/test/rtree/test_rtree_exceptions.hpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/test_rtree_exceptions.hpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/test_rtree_exceptions.hpp 2012-11-11 21:36:41 EST (Sun, 11 Nov 2012)
@@ -161,7 +161,7 @@
 
 struct internal_node_bad_alloc : public std::exception
 {
- const char * what() { return "internal node creation failed."; }
+ const char * what() const throw() { return "internal node creation failed."; }
 };
 
 // create_node
@@ -196,7 +196,7 @@
 
 struct leaf_bad_alloc : public std::exception
 {
- const char * what() { return "leaf node creation failed."; }
+ const char * what() const throw() { return "leaf node creation failed."; }
 };
 
 template <typename Allocators, typename Value, typename Parameters, typename Box>
@@ -235,7 +235,7 @@
 
 struct throwing_value_copy_exception : public std::exception
 {
- const char * what() { return "value copy failed."; }
+ const char * what() const throw() { return "value copy failed."; }
 };
 
 struct throwing_value


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