From 49455959ece848244a196b28e772dab3db2732d2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 9 Feb 2009 22:12:30 +0000 Subject: [PATCH] Merged from OSG-2.8 branch the suppression of the wrapping of the ScopeLock --- src/osgWrappers/genwrapper.conf | 6 ++++++ src/osgWrappers/osgParticle/ParticleSystem.cpp | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/osgWrappers/genwrapper.conf b/src/osgWrappers/genwrapper.conf index 1b1ee7718..1d45484a3 100644 --- a/src/osgWrappers/genwrapper.conf +++ b/src/osgWrappers/genwrapper.conf @@ -294,6 +294,12 @@ end ############################################################################# +# Suppress scoped lock template + +suppress reflector "OpenThreads::ScopedLock< OpenThreads::Mutex >" + +############################################################################# + # Suppress nested nested class method configure reflector "osgShadow::OccluderGeometry" diff --git a/src/osgWrappers/osgParticle/ParticleSystem.cpp b/src/osgWrappers/osgParticle/ParticleSystem.cpp index 315d27444..495196152 100644 --- a/src/osgWrappers/osgParticle/ParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystem.cpp @@ -310,12 +310,3 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystem) 0); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(OpenThreads::ScopedLock< OpenThreads::Mutex >) - I_DeclaringFile("OpenThreads/ScopedLock"); - I_Constructor1(IN, OpenThreads::Mutex &, m, - Properties::EXPLICIT, - ____ScopedLock__M_R1, - "", - ""); -END_REFLECTOR -