[libsigcplusplus] Revert "concepts: bind: Use the origin::Copy_constructible C++ concept."
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsigcplusplus] Revert "concepts: bind: Use the origin::Copy_constructible C++ concept."
- Date: Tue, 19 Apr 2016 19:39:17 +0000 (UTC)
commit b5f44c4da3a0669943b5336b09e251e1bd9f12c3
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Apr 19 21:35:27 2016 +0200
Revert "concepts: bind: Use the origin::Copy_constructible C++ concept."
This reverts commit 66cee4dd3c0595ee62b446afafb5bbbfdcd36eca.
I didn't mean to push this to master.
sigc++/adaptors/bind.h | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/sigc++/adaptors/bind.h b/sigc++/adaptors/bind.h
index 7e370f4..fc2901d 100644
--- a/sigc++/adaptors/bind.h
+++ b/sigc++/adaptors/bind.h
@@ -7,7 +7,6 @@
#include <sigc++/tuple-utils/tuple_start.h>
#include <sigc++/tuple-utils/tuple_end.h>
#include <sigc++/tuple-utils/tuple_transform_each.h>
-#include <origin/core/function.hpp>
namespace sigc
@@ -105,7 +104,7 @@ struct TransformEachInvoker
*
* @ingroup bind
*/
-template <int I_location, typename T_functor, origin::Copy_constructible... T_bound>
+template <int I_location, typename T_functor, typename... T_bound>
struct bind_functor : public adapts<T_functor>
{
/** Invokes the wrapped functor passing on the arguments.
@@ -213,7 +212,7 @@ private:
*
* @ingroup bind
*/
-template <int T_loc, typename T_functor, origin::Copy_constructible... T_bound>
+template <int T_loc, typename T_functor, typename... T_bound>
struct visitor<bind_functor<T_loc, T_functor, T_bound...>>
{
template <typename T_action>
@@ -232,7 +231,7 @@ struct visitor<bind_functor<T_loc, T_functor, T_bound...>>
*
* @ingroup bind
*/
-template <typename T_functor, origin::Copy_constructible... T_type>
+template <typename T_functor, typename... T_type>
struct visitor<bind_functor<-1, T_functor, T_type...>>
{
template <typename T_action>
@@ -258,7 +257,7 @@ struct visitor<bind_functor<-1, T_functor, T_type...>>
*
* @ingroup bind
*/
-template <int I_location, typename T_functor, origin::Copy_constructible... T_bound>
+template <int I_location, typename T_functor, typename... T_bound>
inline decltype(auto)
bind(const T_functor& func, T_bound... b)
{
@@ -275,7 +274,7 @@ bind(const T_functor& func, T_bound... b)
*
* @ingroup bind
*/
-template <typename T_functor, origin::Copy_constructible... T_type>
+template <typename T_functor, typename... T_type>
inline decltype(auto)
bind(const T_functor& func, T_type... b)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]