diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-01-12 09:02:04 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-01-12 09:02:04 +0200 |
| commit | 725d1a2f7952ea47ddaa8c9f056002879d470169 (patch) | |
| tree | db39b77195cb4cd8fb2a4035f6dd6068d75e7a61 | |
| parent | 68a5c554923bcb1ac223908aefd0181870c6d47f (diff) | |
Use typedef name instead of qualifying in multiple places
| -rw-r--r-- | odb/oracle/object-result.hxx | 4 | ||||
| -rw-r--r-- | odb/oracle/object-result.txx | 8 | ||||
| -rw-r--r-- | odb/oracle/view-result.hxx | 2 | ||||
| -rw-r--r-- | odb/oracle/view-result.txx | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/odb/oracle/object-result.hxx b/odb/oracle/object-result.hxx index 91683de..76335d4 100644 --- a/odb/oracle/object-result.hxx +++ b/odb/oracle/object-result.hxx @@ -59,6 +59,8 @@ namespace odb using base_type::current; private: + typedef oracle::change_callback change_callback_type; + static void change_callback (void* context); @@ -103,6 +105,8 @@ namespace odb using base_type::current; private: + typedef oracle::change_callback change_callback_type; + static void change_callback (void* context); diff --git a/odb/oracle/object-result.txx b/odb/oracle/object-result.txx index 6cd994b..3cf4e3e 100644 --- a/odb/oracle/object-result.txx +++ b/odb/oracle/object-result.txx @@ -22,7 +22,7 @@ namespace odb object_result_impl<T>:: ~object_result_impl () { - oracle::change_callback& cc (statements_.image ().change_callback_); + change_callback_type& cc (statements_.image ().change_callback_); if (cc.context == this) { @@ -100,7 +100,7 @@ namespace odb this->current (pointer_type ()); typename object_traits::image_type& im (statements_.image ()); - oracle::change_callback& cc (im.change_callback_); + change_callback_type& cc (im.change_callback_); if (cc.context == this) { @@ -172,7 +172,7 @@ namespace odb object_result_impl_no_id<T>:: ~object_result_impl_no_id () { - oracle::change_callback& cc (statements_.image ().change_callback_); + change_callback_type& cc (statements_.image ().change_callback_); if (cc.context == this) { @@ -220,7 +220,7 @@ namespace odb this->current (pointer_type ()); typename object_traits::image_type& im (statements_.image ()); - oracle::change_callback& cc (im.change_callback_); + change_callback_type& cc (im.change_callback_); if (cc.context == this) { diff --git a/odb/oracle/view-result.hxx b/odb/oracle/view-result.hxx index 063680f..b0d96de 100644 --- a/odb/oracle/view-result.hxx +++ b/odb/oracle/view-result.hxx @@ -55,6 +55,8 @@ namespace odb using base_type::current; private: + typedef oracle::change_callback change_callback_type; + static void change_callback (void* context); diff --git a/odb/oracle/view-result.txx b/odb/oracle/view-result.txx index 9b9b0c9..9488e2b 100644 --- a/odb/oracle/view-result.txx +++ b/odb/oracle/view-result.txx @@ -16,7 +16,7 @@ namespace odb view_result_impl<T>:: ~view_result_impl () { - oracle::change_callback& cc (statements_.image ().change_callback_); + change_callback_type& cc (statements_.image ().change_callback_); if (cc.context == this) { @@ -63,7 +63,7 @@ namespace odb this->current (pointer_type ()); typename view_traits::image_type& im (statements_.image ()); - oracle::change_callback& cc (im.change_callback_); + change_callback_type& cc (im.change_callback_); if (cc.context == this) { |