aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--odb/pointer-traits.hxx4
-rw-r--r--odb/result.hxx2
-rw-r--r--odb/tr1-pointer-traits.hxx2
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<pointer_type> guard_type;
+ typedef naked_ptr_guard<pointer_type> 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<element_type> pointer_type;
typedef std::auto_ptr<const element_type> const_pointer_type;
- typedef smart_ptr_guard<pointer_type> guard_type;
+ typedef smart_ptr_guard<pointer_type> 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 <typename T>
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<element_type> pointer_type;
typedef std::tr1::shared_ptr<const element_type> const_pointer_type;
- typedef smart_ptr_guard<pointer_type> guard_type;
+ typedef smart_ptr_guard<pointer_type> guard;
static element_type*
get_ptr (const pointer_type& p)