FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Tree, fixes for Java bindings

Browse Source
This commit is contained in:
Robert Osfield
2004-11-15 13:02:43 +00:00
parent cd70b40875
commit 84d3746e8a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/Referenced
View File

@@ -16,14 +16,14 @@
// When building OSG with Java need to derive from Noodle::CBridgable class,
// therefore so OSG_JAVA_BUILD must be defined. Also the thread-safe ref/unref test
// as built in for the NoodleCore wrapping. NoodleCore has a Garbage collector mechanism
// as built in for the NoodleGlue wrapping. NoodleGlue has a Garbage collector mechanism
// which is very similar to osg::DeletionManager. So these aspects of osg::Referenced
// have been removed
//#define OSG_JAVA_BUILD
#include <osg/Export>
#ifdef OSG_JAVA_BUILD
#include <NoodleCore/Bridgable.h>
#include <NoodleGlue/Bridgable.h>
#else
#include <OpenThreads/Mutex>
#endif
@@ -132,10 +132,10 @@ class DeleteHandler
/** Java wrappers use the CBridgable base-class for referencing
* and garbage collection.
*/
class SG_EXPORT Referenced : public Noodle::CBridgable
class SG_EXPORT Referenced : public NoodleGlue::CBridgable
{
public:
/** Method not used in NoodleCore referencing
/** Method not used in NoodleGlue referencing
*/
inline void unref_nodelete() const { --_refCount; }
inline int referenceCount() const { return _refCount; }