diff options
Diffstat (limited to 'odb/tr1/pointer-traits.hxx')
| -rw-r--r-- | odb/tr1/pointer-traits.hxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/odb/tr1/pointer-traits.hxx b/odb/tr1/pointer-traits.hxx index 5ba1b93..12e1164 100644 --- a/odb/tr1/pointer-traits.hxx +++ b/odb/tr1/pointer-traits.hxx @@ -7,6 +7,13 @@ #include <odb/pre.hxx> +#include <odb/details/config.hxx> // ODB_CXX11 + +// In VC++ std::shared_ptr and std::tr1::shared_ptr is the same class +// template. One is just a using-declaration for the other. +// +#if !(defined(ODB_CXX11) && defined(_MSC_VER)) + // // This header assumes that the necessary TR1 header has already // been included. @@ -94,6 +101,8 @@ namespace odb }; } +#endif // !(ODB_CXX11 && _MSC_VER) + #include <odb/post.hxx> #endif // ODB_TR1_POINTER_TRAITS_HXX |