X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_boost_threads.cpp;h=bb51287e50d4b02745b0c470e023db01352ebf45;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=68cdec3cc99a54fac39dbead84b22fc80890f874;hpb=637a685d61a9ff0e3f398a59da426979815c4d68;p=metaproxy-moved-to-github.git diff --git a/src/test_boost_threads.cpp b/src/test_boost_threads.cpp index 68cdec3..bb51287 100644 --- a/src/test_boost_threads.cpp +++ b/src/test_boost_threads.cpp @@ -1,7 +1,5 @@ -/* $Id: test_boost_threads.cpp,v 1.10 2007-05-09 21:23:09 adam Exp $ - Copyright (c) 2005-2007, Index Data. - -This file is part of Metaproxy. +/* This file is part of Metaproxy. + Copyright (C) Index Data Metaproxy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -14,16 +12,16 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Metaproxy; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include "config.hpp" #include #include #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include #include @@ -33,12 +31,12 @@ class counter { public: counter() : count(0) { } - + int increment() { boost::mutex::scoped_lock scoped_lock(mutex); return ++count; } - + private: boost::mutex mutex; int count; @@ -57,13 +55,13 @@ public: #define USE_GROUP 1 -BOOST_AUTO_UNIT_TEST( thread_group ) +BOOST_AUTO_TEST_CASE( thread_group ) { - try + try { const int num_threads = 4; boost::thread_group thrds; - + for (int i=0; i < num_threads; ++i) { worker w; @@ -71,7 +69,7 @@ BOOST_AUTO_UNIT_TEST( thread_group ) } thrds.join_all(); } - catch (...) + catch (...) { BOOST_CHECK(false); } @@ -79,13 +77,13 @@ BOOST_AUTO_UNIT_TEST( thread_group ) } -BOOST_AUTO_UNIT_TEST( thread_list ) +BOOST_AUTO_TEST_CASE( thread_list ) { - try + try { const int num_threads = 4; std::list thread_list; - + for (int i=0; i < num_threads; ++i) { worker w; @@ -99,7 +97,7 @@ BOOST_AUTO_UNIT_TEST( thread_list ) } } - catch (...) + catch (...) { BOOST_CHECK(false); } @@ -111,8 +109,9 @@ BOOST_AUTO_UNIT_TEST( thread_list ) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +