diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index b4b52b5b155..fde808f5acd 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -1323,7 +1323,7 @@ IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context* context) { } - virtual ICE_API ::Ice::DispatchStatus + virtual ::Ice::DispatchStatus run(::Ice::Object* object) { _result = object->ice_isA(_id, _current); @@ -1374,7 +1374,7 @@ IceDelegateD::Ice::Object::ice_ping(const ::Ice::Context* context) { } - virtual ICE_API ::Ice::DispatchStatus + virtual ::Ice::DispatchStatus run(::Ice::Object* object) { object->ice_ping(_current); @@ -1419,7 +1419,7 @@ IceDelegateD::Ice::Object::ice_ids(const ::Ice::Context* context) { } - virtual ICE_API ::Ice::DispatchStatus + virtual ::Ice::DispatchStatus run(::Ice::Object* object) { _result = object->ice_ids(_current); @@ -1470,7 +1470,7 @@ IceDelegateD::Ice::Object::ice_id(const ::Ice::Context* context) { } - virtual ICE_API ::Ice::DispatchStatus + virtual ::Ice::DispatchStatus run(::Ice::Object* object) { _result = object->ice_id(_current); diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 7a39e08d904..7bccba8919f 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2554,7 +2554,9 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p) // // run // - // C << nl << nl << "virtual " << _dllExport << "::Ice::DispatchStatus"; + // No need to dllexport run since the caller (the proxy) is always in the same + // DLL as this translation unit (the direct delegate). + // C << nl << nl << "virtual ::Ice::DispatchStatus"; C << nl << "run(::Ice::Object* object)"; C << sb; |