jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++

Browse source 
Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++

Conflicts:

	include/dbus-c++/connection.h
	include/dbus-c++/dispatcher.h
	include/dbus-c++/pendingcall.h
	src/dispatcher.cpp
This commit is contained in:
Andreas Volz 2008-08-14 23:59:23 +02:00
commit c1970e2352
57 changed files with 1642 additions and 1638 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pendingcall_p.h
View file

@ -39,15 +39,15 @@ namespace DBus {
struct DXXAPILOCAL PendingCall::Private
{
DBusPendingCall* call;
DBusPendingCall *call;
int dataslot;
Slot<void, PendingCall&> slot;
Slot<void, PendingCall &> slot;
Private( DBusPendingCall* );
Private(DBusPendingCall *);
~Private();
static void notify_stub( DBusPendingCall* dpc, void* data );
static void notify_stub(DBusPendingCall *dpc, void *data);
};
} /* namespace DBus */