From 9502ebbff304fdd970cbbe3d3e7847851ca89141 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 8 Feb 2013 12:55:28 +0200 Subject: Add callback_ prefix to transaction callback functions Also test callback_update(). --- odb/transaction.hxx | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'odb/transaction.hxx') diff --git a/odb/transaction.hxx b/odb/transaction.hxx index e035661..497b89b 100644 --- a/odb/transaction.hxx +++ b/odb/transaction.hxx @@ -121,26 +121,29 @@ namespace odb // unspecified. // void - register_ (callback_type, - void* key, - unsigned short event = event_all, - unsigned long long data = 0, - transaction** state = 0); + callback_register (callback_type, + void* key, + unsigned short event = event_all, + unsigned long long data = 0, + transaction** state = 0); // Unregister a post-commit/rollback callback. Note that this is a // potentially slow operation. You also don't need to unregister // a callback that has been called or auto-reset using the state - // argument passed to register_(). This function does nothing if + // argument passed to register(). This function does nothing if // the key is not found. // void - unregister (void* key); + callback_unregister (void* key); - // Update the data and state values for a callback. Note that just - // like unregister(), this is a potentially slow operation. + // Update the event, data, and state values for a callback. Note + // that just like unregister(), this is a potentially slow operation. // void - update (void* key, unsigned long long data, transaction** state = 0); + callback_update (void* key, + unsigned short event, + unsigned long long data = 0, + transaction** state = 0); public: transaction_impl& @@ -156,10 +159,10 @@ namespace odb friend struct rollback_guard; std::size_t - find (void* key); + callback_find (void* key); void - call (unsigned short event); + callback_call (unsigned short event); protected: bool finalized_; -- cgit v1.1