diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6d8daa85cbb..7585153ed1d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2009-12-03 Paolo Carlini + + * testsuite/20_util/bind/ref.cc: Add. + * testsuite/20_util/bind/all_bound.cc: Likewise. + * testsuite/20_util/bind/nested.cc: Likewise. + * testsuite/20_util/bind/placeholders.cc: Likewise. + 2009-12-03 Hans-Peter Nilsson * testsuite/ext/profile/mutex_extensions.cc: Adjust dg-error line diff --git a/libstdc++-v3/testsuite/20_util/bind/all_bound.cc b/libstdc++-v3/testsuite/20_util/bind/all_bound.cc new file mode 100644 index 00000000000..4335ee1d1fb --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/bind/all_bound.cc @@ -0,0 +1,39 @@ +// { dg-options "-std=gnu++0x" } +// Copyright (C) 2009 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library 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 Software Foundation; either version 3, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or 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 this library; see the file COPYING3. If not see +// . + +// 20.7.11 Function template bind + +#include +#include + +// Operations on empty function<> objects +void test01() +{ + bool test __attribute__((unused)) = true; + + VERIFY( std::bind(std::plus(), 3, 5)() == 8 ); + VERIFY( std::bind(std::minus(), 3, 5)() == -2 ); + VERIFY( std::bind(std::plus(), 3, 5)() == 8 ); + VERIFY( std::bind(std::minus(), 3, 5)() == -2 ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/20_util/bind/nested.cc b/libstdc++-v3/testsuite/20_util/bind/nested.cc new file mode 100644 index 00000000000..ae3a1668620 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/bind/nested.cc @@ -0,0 +1,42 @@ +// { dg-options "-std=gnu++0x" } +// Copyright (C) 2009 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library 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 Software Foundation; either version 3, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or 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 this library; see the file COPYING3. If not see +// . + +// 20.7.11 Function template bind + +#include +#include + +// Operations on empty function<> objects +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std::placeholders; + + int five = 5; + int seven = 7; + VERIFY( std::bind(std::multiplies(), _1, + std::bind(std::minus(), 6, _2))(five, seven) == -5 ); + VERIFY( std::bind(std::multiplies(), _1, + std::bind(std::minus(), 6, _2))(seven, five) == 7 ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/20_util/bind/placeholders.cc b/libstdc++-v3/testsuite/20_util/bind/placeholders.cc new file mode 100644 index 00000000000..fc0d9c64f62 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/bind/placeholders.cc @@ -0,0 +1,40 @@ +// { dg-options "-std=gnu++0x" } +// Copyright (C) 2009 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library 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 Software Foundation; either version 3, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or 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 this library; see the file COPYING3. If not see +// . + +// 20.7.11 Function template bind + +#include +#include + +// Operations on empty function<> objects +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std::placeholders; + + int five = 5; + int seven = 7; + VERIFY( std::bind(std::minus(), _1, _2)(five, seven) == -2 ); + VERIFY( std::bind(std::minus(), _2, _1)(five, seven) == 2 ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/20_util/bind/ref.cc b/libstdc++-v3/testsuite/20_util/bind/ref.cc new file mode 100644 index 00000000000..6b41f188791 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/bind/ref.cc @@ -0,0 +1,55 @@ +// { dg-options "-std=gnu++0x" } +// Copyright (C) 2009 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library 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 Software Foundation; either version 3, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or 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 this library; see the file COPYING3. If not see +// . + +// 20.7.11 Function template bind + +#include +#include + +struct X +{ + X() : bar(17) {} + + int foo(int x, int y) { return bar + x + y; } + + int bar; + +private: + X(const X&); + X& operator=(const X&); +}; + +// Operations on empty function<> objects +void test01() +{ + bool test __attribute__((unused)) = true; + using std::bind; + using std::ref; + ::X x; + + VERIFY( bind(&::X::foo, ref(x), 1, 2)() == 20 ); + VERIFY( bind(&::X::foo, ref(x), 1, 2)() == 20 ); + VERIFY( bind(&::X::bar, ref(x))() == 17 ); + VERIFY( bind(&::X::bar, ref(x))() == 17 ); +} + +int main() +{ + test01(); + return 0; +}