summaryrefslogtreecommitdiff
path: root/cpp/src/IceBT
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-11-05 10:51:56 -0400
committerBernard Normier <bernard@zeroc.com>2016-11-05 10:51:56 -0400
commita9207c4a7e8190cb64286afc1b373f16010d0feb (patch)
treeb6815a6debc9b9589145cc12f192b6dd83b3f49e /cpp/src/IceBT
parentRevert "Reverted previous double-underscore changes in IceUtil classes" (diff)
downloadice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.bz2
ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.xz
ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.zip
Revert "Replaced double and triple underscores in C++ by ice-prefixed names"
This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.
Diffstat (limited to 'cpp/src/IceBT')
-rw-r--r--cpp/src/IceBT/DBus.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceBT/DBus.cpp b/cpp/src/IceBT/DBus.cpp
index 2b40398b39a..9101e88bb60 100644
--- a/cpp/src/IceBT/DBus.cpp
+++ b/cpp/src/IceBT/DBus.cpp
@@ -826,7 +826,7 @@ public:
// Bump our refcount to ensure this object lives until the reply is received.
// The pendingFree function will decrement the refcount.
//
- iceIncRef();
+ __incRef();
if(!::dbus_pending_call_set_notify(_call, pendingCallCompletedCallback, this, pendingCallFree))
{
@@ -971,7 +971,7 @@ pendingCallFree(void* userData)
{
AsyncResultI* r = static_cast<AsyncResultI*>(userData);
assert(r);
- r->iceDecRef();
+ r->__decRef();
}
static DBusHandlerResult filterCallback(DBusConnection*, DBusMessage*, void*);
@@ -1117,7 +1117,7 @@ public:
::dbus_bus_add_match(_connection, "type='signal'", 0);
//::dbus_bus_add_match(_connection, "type='method_call'", 0);
- iceIncRef(); // iceDecRef called in freeConnection.
+ __incRef(); // __decRef called in freeConnection.
_thread = new HelperThread(this);
_thread->start();
@@ -1229,7 +1229,7 @@ static void freeConnection(void* p)
{
ConnectionI* c = static_cast<ConnectionI*>(p);
assert(c);
- c->iceDecRef();
+ c->__decRef();
}
}