Skip to content

Commit

Permalink
Merge branch 'master' of github.com:headmyshoulder/odeint-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
mariomulansky committed Nov 11, 2014
2 parents f171a84 + 61df23d commit df07f80
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions include/boost/numeric/odeint/util/unwrap_reference.hpp
Expand Up @@ -31,9 +31,9 @@
namespace boost {

#if BOOST_NUMERIC_ODEINT_CXX11
template<typename T> class reference_wrapper;
template<typename T> struct reference_wrapper;

template<typename T> class unwrap_reference;
template<typename T> struct unwrap_reference;
#endif

namespace numeric {
Expand All @@ -43,24 +43,21 @@ namespace odeint {
#if BOOST_NUMERIC_ODEINT_CXX11

template<typename T>
class unwrap_reference
struct unwrap_reference
{
public:
typedef typename std::remove_reference<T>::type type;
};

template<typename T>
class unwrap_reference< std::reference_wrapper<T> >
struct unwrap_reference< std::reference_wrapper<T> >
{
public:
typedef typename std::remove_reference<T>::type type;
};

template<typename T>
class unwrap_reference< boost::reference_wrapper<T> >
struct unwrap_reference< boost::reference_wrapper<T> >
{
public:
typedef typename boost::unwrap_reference<T>::type type;
typedef typename boost::unwrap_reference<T>::type type;
};

#else
Expand Down

0 comments on commit df07f80

Please sign in to comment.