summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2018-01-22 18:36:49 -0500
committerBernard Normier <bernard@zeroc.com>2018-01-22 18:36:49 -0500
commit4ebcd834025446d57a0ba8406e710ada79ce8881 (patch)
tree2be9de17c326e83a036845328b55017f7bcc7d8c
parentWhitespace cleanup (diff)
downloadice-4ebcd834025446d57a0ba8406e710ada79ce8881.tar.bz2
ice-4ebcd834025446d57a0ba8406e710ada79ce8881.tar.xz
ice-4ebcd834025446d57a0ba8406e710ada79ce8881.zip
Added missing ICEregisterIceStringConverter
-rw-r--r--cpp/src/Ice/StringConverterPlugin.cpp9
-rw-r--r--objective-c/include/objc/Ice/Initialize.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/cpp/src/Ice/StringConverterPlugin.cpp b/cpp/src/Ice/StringConverterPlugin.cpp
index 16125c7bda6..ce73dab88cd 100644
--- a/cpp/src/Ice/StringConverterPlugin.cpp
+++ b/cpp/src/Ice/StringConverterPlugin.cpp
@@ -186,3 +186,12 @@ registerIceStringConverter(bool loadOnInitialize)
}
}
+
+//
+// Objective-C function to allow Objective-C programs to register plugin.
+//
+extern "C" ICE_API void
+ICEregisterIceStringConverter(bool loadOnInitialize)
+{
+ Ice::registerIceStringConverter(loadOnInitialize);
+}
diff --git a/objective-c/include/objc/Ice/Initialize.h b/objective-c/include/objc/Ice/Initialize.h
index 4f8fa378c2a..30fbb43e6e7 100644
--- a/objective-c/include/objc/Ice/Initialize.h
+++ b/objective-c/include/objc/Ice/Initialize.h
@@ -92,6 +92,7 @@ ICE_API @interface ICEUtil : NSObject
+(ICEProtocolVersion*) protocolVersionWithString:(NSString*)str;
@end
+extern void ICEregisterIceStringConverter(BOOL);
extern void ICEregisterIceSSL(BOOL);
extern void ICEregisterIceUDP(BOOL);
extern void ICEregisterIceWS(BOOL);