diff options
author | Bernard Normier <bernard@zeroc.com> | 2018-01-22 15:20:04 -0500 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2018-01-22 15:20:04 -0500 |
commit | eb1ff41658e4d81499914a5d42f59c49f03f1cea (patch) | |
tree | a182b37d152f00d6177393405285ee49531d74c5 | |
parent | ICE-8584 - Javadoc fix for Ice.Object (diff) | |
download | ice-eb1ff41658e4d81499914a5d42f59c49f03f1cea.tar.bz2 ice-eb1ff41658e4d81499914a5d42f59c49f03f1cea.tar.xz ice-eb1ff41658e4d81499914a5d42f59c49f03f1cea.zip |
Moved ice_collectable impl out of line (ICE-8610)
-rw-r--r-- | cpp/include/Ice/Object.h | 2 | ||||
-rw-r--r-- | cpp/src/Ice/Object.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index 0cf099100e5..93944cfa9b0 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -285,7 +285,7 @@ public: * are eligible for garbage collection when all external references to the graph have been released. * @param b True if the object is eligible, false otherwise. */ - virtual void ice_collectable(bool b) { } + virtual void ice_collectable(bool b); /** * The Ice run time invokes this method prior to marshaling an object's data members. This allows a subclass diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 9fce2f852d5..90f600eea27 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -251,6 +251,11 @@ Ice::Object::_iceDispatch(Incoming& in, const Current& current) #ifndef ICE_CPP11_MAPPING void +Ice::Object::ice_collectable(bool) +{ +} + +void Ice::Object::ice_preMarshal() { } |