Internal code cleanup

8 files changed, 18 insertions, 18 deletions

diff --git a/matlab/src/IceMatlab/Communicator.cpp b/matlab/src/IceMatlab/Communicator.cpp
index efc87bcdf8b..04a194eee6b 100644
--- a/matlab/src/IceMatlab/Communicator.cpp
+++ b/matlab/src/IceMatlab/Communicator.cpp
@@ -34,7 +34,7 @@ extern "C"
 {
 
 EXPORTED_FUNCTION mxArray*
-Ice_Communicator__release(void* self)
+Ice_Communicator_unref(void* self)
 {
     delete &SELF;
     return 0;
diff --git a/matlab/src/IceMatlab/Connection.cpp b/matlab/src/IceMatlab/Connection.cpp
index 117254fcb71..d6cf2a1bd2f 100644
--- a/matlab/src/IceMatlab/Connection.cpp
+++ b/matlab/src/IceMatlab/Connection.cpp
@@ -136,7 +136,7 @@ extern "C"
 {
 
 EXPORTED_FUNCTION mxArray*
-Ice_Connection__release(void* self)
+Ice_Connection_unref(void* self)
 {
     delete &SELF;
     return 0;
diff --git a/matlab/src/IceMatlab/Endpoint.cpp b/matlab/src/IceMatlab/Endpoint.cpp
index 27020714961..a2ac79891a7 100644
--- a/matlab/src/IceMatlab/Endpoint.cpp
+++ b/matlab/src/IceMatlab/Endpoint.cpp
@@ -151,7 +151,7 @@ extern "C"
 {
 
 EXPORTED_FUNCTION mxArray*
-Ice_Endpoint__release(void* self)
+Ice_Endpoint_unref(void* self)
 {
     delete &SELF;
     return 0;
diff --git a/matlab/src/IceMatlab/Future.cpp b/matlab/src/IceMatlab/Future.cpp
index ce46e2f084e..dc439d0cd34 100644
--- a/matlab/src/IceMatlab/Future.cpp
+++ b/matlab/src/IceMatlab/Future.cpp
@@ -108,7 +108,7 @@ extern "C"
 {
 
 EXPORTED_FUNCTION mxArray*
-Ice_SimpleFuture__release(void* self)
+Ice_SimpleFuture_unref(void* self)
 {
     delete &SFSELF;
     return 0;
diff --git a/matlab/src/IceMatlab/Logger.cpp b/matlab/src/IceMatlab/Logger.cpp
index 72d2f72a8e9..a558ca2488a 100644
--- a/matlab/src/IceMatlab/Logger.cpp
+++ b/matlab/src/IceMatlab/Logger.cpp
@@ -29,7 +29,7 @@ extern "C"
 {
 
 EXPORTED_FUNCTION mxArray*
-Ice_Logger__release(void* self)
+Ice_Logger_unref(void* self)
 {
     delete &SELF;
     return 0;
diff --git a/matlab/src/IceMatlab/ObjectPrx.cpp b/matlab/src/IceMatlab/ObjectPrx.cpp
index 36069b7693c..c2ef3d0b89b 100644
--- a/matlab/src/IceMatlab/ObjectPrx.cpp
+++ b/matlab/src/IceMatlab/ObjectPrx.cpp
@@ -227,7 +227,7 @@ extern "C"
 {
 
 EXPORTED_FUNCTION mxArray*
-Ice_ObjectPrx__release(void* self)
+Ice_ObjectPrx_unref(void* self)
 {
     delete &SELF;
     return 0;
@@ -1132,7 +1132,7 @@ Ice_ObjectPrx_clone(void* self, void** r)
 }
 
 EXPORTED_FUNCTION mxArray*
-Ice_InvocationFuture__release(void* self)
+Ice_InvocationFuture_unref(void* self)
 {
     delete &IFSELF;
     return 0;
@@ -1236,7 +1236,7 @@ Ice_InvocationFuture_check(void* self)
 }
 
 EXPORTED_FUNCTION mxArray*
-Ice_GetConnectionFuture__release(void* self)
+Ice_GetConnectionFuture_unref(void* self)
 {
     delete &GCFSELF;
     return 0;
diff --git a/matlab/src/IceMatlab/Properties.cpp b/matlab/src/IceMatlab/Properties.cpp
index c8992c7dd18..be3a4cf679a 100644
--- a/matlab/src/IceMatlab/Properties.cpp
+++ b/matlab/src/IceMatlab/Properties.cpp
@@ -50,7 +50,7 @@ Ice_createProperties(mxArray* args, void* defaultsImpl, void** r)
 }
 
 EXPORTED_FUNCTION mxArray*
-Ice_Properties__release(void* self)
+Ice_Properties_unref(void* self)
 {
     delete &SELF;
     return 0;
diff --git a/matlab/src/IceMatlab/icematlab.h b/matlab/src/IceMatlab/icematlab.h
index facdc81364e..7cce7365eb9 100644
--- a/matlab/src/IceMatlab/icematlab.h
+++ b/matlab/src/IceMatlab/icematlab.h
@@ -33,7 +33,7 @@ EXPORTED_FUNCTION mxArray* Ice_currentEncoding();
 EXPORTED_FUNCTION mxArray* Ice_currentProtocol();
 EXPORTED_FUNCTION mxArray* Ice_currentProtocolEncoding();
 
-EXPORTED_FUNCTION mxArray* Ice_Communicator__release(void*);
+EXPORTED_FUNCTION mxArray* Ice_Communicator_unref(void*);
 EXPORTED_FUNCTION mxArray* Ice_Communicator_destroy(void*);
 EXPORTED_FUNCTION mxArray* Ice_Communicator_destroyAsync(void*, void**);
 EXPORTED_FUNCTION mxArray* Ice_Communicator_stringToProxy(void*, const char*, void**);
@@ -50,7 +50,7 @@ EXPORTED_FUNCTION mxArray* Ice_Communicator_setDefaultLocator(void*, void*);
 EXPORTED_FUNCTION mxArray* Ice_Communicator_flushBatchRequests(void*, mxArray*);
 EXPORTED_FUNCTION mxArray* Ice_Communicator_flushBatchRequestsAsync(void*, mxArray*, void**);
 
-EXPORTED_FUNCTION mxArray* Ice_ObjectPrx__release(void*);
+EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_unref(void*);
 EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_equals(void*, void*);
 EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_read(void*, mxArray*, mxArray*, int, int, void**);
 EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_write(void*, void*, mxArray*);
@@ -112,27 +112,27 @@ EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_ice_flushBatchRequests(void*);
 EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_ice_flushBatchRequestsAsync(void*, void**);
 EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_clone(void*, void**);
 
-EXPORTED_FUNCTION mxArray* Ice_InvocationFuture__release(void*);
+EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_unref(void*);
 EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_wait(void*, unsigned char*);
 EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_results(void*);
 EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_state(void*);
 EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_cancel(void*);
 EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_check(void*);
 
-EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture__release(void*);
+EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture_unref(void*);
 EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture_wait(void*, unsigned char*);
 EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture_fetch(void*, void**);
 EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture_state(void*);
 EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture_cancel(void*);
 
-EXPORTED_FUNCTION mxArray* Ice_SimpleFuture__release(void*);
+EXPORTED_FUNCTION mxArray* Ice_SimpleFuture_unref(void*);
 EXPORTED_FUNCTION mxArray* Ice_SimpleFuture_wait(void*, unsigned char*);
 EXPORTED_FUNCTION mxArray* Ice_SimpleFuture_state(void*);
 EXPORTED_FUNCTION mxArray* Ice_SimpleFuture_cancel(void*);
 EXPORTED_FUNCTION mxArray* Ice_SimpleFuture_check(void*);
 
 EXPORTED_FUNCTION mxArray* Ice_createProperties(mxArray*, void*, void**);
-EXPORTED_FUNCTION mxArray* Ice_Properties__release(void*);
+EXPORTED_FUNCTION mxArray* Ice_Properties_unref(void*);
 EXPORTED_FUNCTION mxArray* Ice_Properties_getProperty(void*, const char*);
 EXPORTED_FUNCTION mxArray* Ice_Properties_getPropertyWithDefault(void*, const char*, const char*);
 EXPORTED_FUNCTION mxArray* Ice_Properties_getPropertyAsInt(void*, const char*, int*);
@@ -147,7 +147,7 @@ EXPORTED_FUNCTION mxArray* Ice_Properties_parseIceCommandLineOptions(void*, mxAr
 EXPORTED_FUNCTION mxArray* Ice_Properties_load(void*, const char*);
 EXPORTED_FUNCTION mxArray* Ice_Properties_clone(void*, void**);
 
-EXPORTED_FUNCTION mxArray* Ice_Connection__release(void*);
+EXPORTED_FUNCTION mxArray* Ice_Connection_unref(void*);
 EXPORTED_FUNCTION mxArray* Ice_Connection_equals(void*, void*);
 EXPORTED_FUNCTION mxArray* Ice_Connection_close(void*, mxArray*);
 EXPORTED_FUNCTION mxArray* Ice_Connection_closeAsync(void*, mxArray*, void**);
@@ -166,7 +166,7 @@ EXPORTED_FUNCTION mxArray* Ice_Connection_getInfo(void*);
 EXPORTED_FUNCTION mxArray* Ice_Connection_setBufferSize(void*, int, int);
 EXPORTED_FUNCTION mxArray* Ice_Connection_throwException(void*);
 
-EXPORTED_FUNCTION mxArray* Ice_Logger__release(void*);
+EXPORTED_FUNCTION mxArray* Ice_Logger_unref(void*);
 EXPORTED_FUNCTION mxArray* Ice_Logger_print(void*, mxArray*);
 EXPORTED_FUNCTION mxArray* Ice_Logger_trace(void*, mxArray*, mxArray*);
 EXPORTED_FUNCTION mxArray* Ice_Logger_warning(void*, mxArray*);
@@ -174,7 +174,7 @@ EXPORTED_FUNCTION mxArray* Ice_Logger_error(void*, mxArray*);
 EXPORTED_FUNCTION mxArray* Ice_Logger_getPrefix(void*);
 EXPORTED_FUNCTION mxArray* Ice_Logger_cloneWithPrefix(void*, mxArray*, void**);
 
-EXPORTED_FUNCTION mxArray* Ice_Endpoint__release(void*);
+EXPORTED_FUNCTION mxArray* Ice_Endpoint_unref(void*);
 EXPORTED_FUNCTION mxArray* Ice_Endpoint_equals(void*, void*);
 EXPORTED_FUNCTION mxArray* Ice_Endpoint_toString(void*);
 EXPORTED_FUNCTION mxArray* Ice_Endpoint_getInfo(void*);