diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2012-03-02 12:34:54 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-03-02 12:34:54 +0200 |
commit | 8a9e1081c026a092c7dfb28fbd079b88850c7233 (patch) | |
tree | f44ba71ea18365b8d9c1a97c09b624a0c4d150dc /odb/tr1/lazy-ptr.hxx | |
parent | 0f25b194dcbcfa95a80284069999dd92341ce36d (diff) |
Portability workarounds for incomplete C++11 support in VC++ and old GCC
Diffstat (limited to 'odb/tr1/lazy-ptr.hxx')
-rw-r--r-- | odb/tr1/lazy-ptr.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/odb/tr1/lazy-ptr.hxx b/odb/tr1/lazy-ptr.hxx index ad6e283..01a7b36 100644 --- a/odb/tr1/lazy-ptr.hxx +++ b/odb/tr1/lazy-ptr.hxx @@ -111,10 +111,10 @@ namespace odb template <class Y> void reset (database_type&, std::auto_ptr<Y>&); template <class Y> void reset (database_type&, const std::tr1::shared_ptr<Y>&); -#ifdef ODB_CXX11 +#ifdef ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT template <class O = T> #else - template <class O /* = T */> + template <class O /*= T*/> #endif typename object_traits<O>::id_type object_id () const; @@ -218,7 +218,7 @@ namespace odb // The object_id() function can only be called when the object is // persistent, or: expired() XOR loaded() (can use != for XOR). // -#ifdef ODB_CXX11 +#ifdef ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT template <class O = T> #else template <class O /* = T */> |