CLOUD: Add RequestIdPair struct

Can be used with Callback<T> (means it's still type safe). It's used to
pass not only Request id to user's callback, but also a value user
wanted.

void *data field is removed from RequestInfo.

1 files changed, 6 insertions, 6 deletions

diff --git a/common/callback.h b/common/callback.h
index 2101331bf0..4356e4b551 100644
--- a/common/callback.h
+++ b/common/callback.h
@@ -48,21 +48,21 @@ public:
 };
 
 /**
-* GlobalFunctionCallback is a simple wrapper for global C functions.
+* GlobalFunctionCallback<T> is a simple wrapper for global C functions.
 *
-* If there is a method, which accepts BaseCallback<void *>, you can
+* If there is a method, which accepts BaseCallback<T>, you can
 * easily pass your C function by passing
-*     new GlobalFunctionCallback(yourFunction)
+*     new GlobalFunctionCallback<T>(yourFunction)
 */
 
-class GlobalFunctionCallback: public BaseCallback<void *> {
-	typedef void(*GlobalFunction)(void *result);
+template<typename T> class GlobalFunctionCallback: public BaseCallback<T> {
+	typedef void(*GlobalFunction)(T result);
 	GlobalFunction _callback;
 
 public:
 	GlobalFunctionCallback(GlobalFunction cb): _callback(cb) {}
 	virtual ~GlobalFunctionCallback() {}
-	virtual void operator()(void *data) {
+	virtual void operator()(T data) {
 		if (_callback) _callback(data);
 	}
 };