From b7135a4be85c27e209acf15a709f789af51baf8f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 9 Dec 2010 11:47:28 +0200 Subject: Cosmetic changes --- odb/tr1-pointer-traits.hxx | 89 ---------------------------------------------- odb/tr1/pointer-traits.hxx | 89 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 odb/tr1-pointer-traits.hxx create mode 100644 odb/tr1/pointer-traits.hxx diff --git a/odb/tr1-pointer-traits.hxx b/odb/tr1-pointer-traits.hxx deleted file mode 100644 index bbeceab..0000000 --- a/odb/tr1-pointer-traits.hxx +++ /dev/null @@ -1,89 +0,0 @@ -// file : odb/tr1-pointer-traits.hxx -// author : Boris Kolpackov -// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC -// license : GNU GPL v2; see accompanying LICENSE file - -#ifndef ODB_TR1_POINTER_TRAITS_HXX -#define ODB_TR1_POINTER_TRAITS_HXX - -#include - -// -// This header assumes that the necessary TR1 header has already -// been included. -// - -#include - -namespace odb -{ - // Specialization for std::tr1::shared_ptr. - // - template - class pointer_traits< std::tr1::shared_ptr > - { - public: - static pointer_kind const kind = pk_shared; - static bool const lazy = false; - - typedef T element_type; - typedef std::tr1::shared_ptr pointer_type; - typedef std::tr1::shared_ptr const_pointer_type; - typedef smart_ptr_guard guard; - - static element_type* - get_ptr (const pointer_type& p) - { - return p.get (); - } - - static element_type& - get_ref (const pointer_type& p) - { - return *p; - } - - static bool - null_ptr (const pointer_type& p) - { - return !p; - } - - public: - static void* - allocate (std::size_t n) - { - return operator new (n); - } - - static void - free (void* p) - { - operator delete (p); - } - }; - - // Specialization for std::tr1::weak_ptr. - // - template - class pointer_traits< std::tr1::weak_ptr > - { - public: - static pointer_kind const kind = pk_weak; - static bool const lazy = false; - - typedef T element_type; - typedef std::tr1::weak_ptr pointer_type; - typedef std::tr1::shared_ptr strong_pointer_type; - - static strong_pointer_type - lock (const pointer_type& p) - { - return p.lock (); - } - }; -} - -#include - -#endif // ODB_TR1_POINTER_TRAITS_HXX diff --git a/odb/tr1/pointer-traits.hxx b/odb/tr1/pointer-traits.hxx new file mode 100644 index 0000000..aff9bc2 --- /dev/null +++ b/odb/tr1/pointer-traits.hxx @@ -0,0 +1,89 @@ +// file : odb/tr1/pointer-traits.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_TR1_POINTER_TRAITS_HXX +#define ODB_TR1_POINTER_TRAITS_HXX + +#include + +// +// This header assumes that the necessary TR1 header has already +// been included. +// + +#include + +namespace odb +{ + // Specialization for std::tr1::shared_ptr. + // + template + class pointer_traits< std::tr1::shared_ptr > + { + public: + static pointer_kind const kind = pk_shared; + static bool const lazy = false; + + typedef T element_type; + typedef std::tr1::shared_ptr pointer_type; + typedef std::tr1::shared_ptr const_pointer_type; + typedef smart_ptr_guard guard; + + static element_type* + get_ptr (const pointer_type& p) + { + return p.get (); + } + + static element_type& + get_ref (const pointer_type& p) + { + return *p; + } + + static bool + null_ptr (const pointer_type& p) + { + return !p; + } + + public: + static void* + allocate (std::size_t n) + { + return operator new (n); + } + + static void + free (void* p) + { + operator delete (p); + } + }; + + // Specialization for std::tr1::weak_ptr. + // + template + class pointer_traits< std::tr1::weak_ptr > + { + public: + static pointer_kind const kind = pk_weak; + static bool const lazy = false; + + typedef T element_type; + typedef std::tr1::weak_ptr pointer_type; + typedef std::tr1::shared_ptr strong_pointer_type; + + static strong_pointer_type + lock (const pointer_type& p) + { + return p.lock (); + } + }; +} + +#include + +#endif // ODB_TR1_POINTER_TRAITS_HXX -- cgit v1.1