From 886f5c5511a3b8291fafd7fe1435916a7c993cf0 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/mysql/source.cxx | 2 +- odb/tracer/source.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/odb/mysql/source.cxx b/odb/mysql/source.cxx index 3b8a01d..0b182ae 100644 --- a/odb/mysql/source.cxx +++ b/odb/mysql/source.cxx @@ -2753,7 +2753,7 @@ namespace mysql << "}" << "pointer_type p (" << endl << "access::object_factory< object_type, pointer_type >::create ());" - << "pointer_traits< pointer_type >::guard_type pg (p);" + << "pointer_traits< pointer_type >::guard pg (p);" << "pointer_cache_traits< pointer_type >::insert_guard ig (" << endl << "pointer_cache_traits< pointer_type >::insert (db, id, p));" << "object_type& obj (pointer_traits< pointer_type >::get_ref (p));" diff --git a/odb/tracer/source.cxx b/odb/tracer/source.cxx index b77d69a..8d1bd4f 100644 --- a/odb/tracer/source.cxx +++ b/odb/tracer/source.cxx @@ -95,7 +95,7 @@ namespace tracer << endl << "pointer_type r (access::object_factory< object_type, " << "pointer_type >::create ());" - << "pointer_traits< pointer_type >::guard_type g (r);" + << "pointer_traits< pointer_type >::guard g (r);" << "r->" << id.name () << " = id;" << "g.release ();" << "return r;" -- cgit v1.1