From 537873ae76666b201e6b9ee15e5172f2772f655a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 26 Nov 2010 13:30:39 +0200 Subject: Rename guard_type to guard for consistency --- odb/pointer-traits.hxx | 4 ++-- odb/result.hxx | 2 +- odb/tr1-pointer-traits.hxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/odb/pointer-traits.hxx b/odb/pointer-traits.hxx index cd25820..90d9b4b 100644 --- a/odb/pointer-traits.hxx +++ b/odb/pointer-traits.hxx @@ -80,7 +80,7 @@ namespace odb typedef T element_type; typedef T* pointer_type; typedef const T* const_pointer_type; - typedef naked_ptr_guard guard_type; + typedef naked_ptr_guard guard; // Return naked pointer to the pointed-to element, including NULL. // @@ -140,7 +140,7 @@ namespace odb typedef T element_type; typedef std::auto_ptr pointer_type; typedef std::auto_ptr const_pointer_type; - typedef smart_ptr_guard guard_type; + typedef smart_ptr_guard guard; static element_type* get_ptr (const pointer_type& p) diff --git a/odb/result.hxx b/odb/result.hxx index cc7495f..54c369d 100644 --- a/odb/result.hxx +++ b/odb/result.hxx @@ -104,7 +104,7 @@ namespace odb private: database_type& db_; pointer_type current_; - typename pointer_traits::guard_type guard_; + typename pointer_traits::guard guard_; }; template diff --git a/odb/tr1-pointer-traits.hxx b/odb/tr1-pointer-traits.hxx index 121a564..b9a0703 100644 --- a/odb/tr1-pointer-traits.hxx +++ b/odb/tr1-pointer-traits.hxx @@ -26,7 +26,7 @@ namespace odb typedef T element_type; typedef std::tr1::shared_ptr pointer_type; typedef std::tr1::shared_ptr const_pointer_type; - typedef smart_ptr_guard guard_type; + typedef smart_ptr_guard guard; static element_type* get_ptr (const pointer_type& p) -- cgit v1.1