diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-09-19 17:28:58 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-09-19 17:28:58 -0400 |
| commit | e0a0f0c5b6a5e5680f6687b5c7a447c9f7f370ac (patch) | |
| tree | ddaca99e297f48f1121da4ed4185f29633095c47 /cpp/src/Ice/Reference.cpp | |
| parent | Removed Application from Ice Services (#196) (diff) | |
| parent | Fixed bug where component libs/systemlib wouldn't be added to linker flags wh... (diff) | |
| download | ice-e0a0f0c5b6a5e5680f6687b5c7a447c9f7f370ac.tar.bz2 ice-e0a0f0c5b6a5e5680f6687b5c7a447c9f7f370ac.tar.xz ice-e0a0f0c5b6a5e5680f6687b5c7a447c9f7f370ac.zip | |
Merge branch '3.7.1-xcode10' into 3.7
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index c54e62ab92d..f4b295f6b23 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -1625,7 +1625,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal { public: - class Callback2 : public Reference::GetConnectionCallback + class Callback2 ICE_FINAL : public Reference::GetConnectionCallback { public: |