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/internalerror.h
View file

@ -45,16 +45,16 @@ struct DXXAPI InternalError
dbus_error_init(&error);
}
explicit InternalError( DBusError* e )
explicit InternalError(DBusError *e)
{
dbus_error_init(&error);
dbus_move_error(e, &error);
}
InternalError(const InternalError& ie)
InternalError(const InternalError &ie)
{
dbus_error_init(&error);
dbus_move_error(const_cast<DBusError*>(&(ie.error)), &error);
dbus_move_error(const_cast<DBusError *>(&(ie.error)), &error);
}
~InternalError()
@ -62,7 +62,7 @@ struct DXXAPI InternalError
dbus_error_free(&error);
}
operator DBusError*()
operator DBusError *()
{
return &error;
}