jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scilab: fix li_boost_shared_ptr test

Browse source
This commit is contained in:
Simon Marchetto 2014-10-13 10:35:00 +02:00
commit c238e9e62c
1 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Examples/test-suite/li_boost_shared_ptr.i
View file

@ -1,7 +1,7 @@
// This tests shared_ptr is working okay. It also checks that there are no memory leaks in the // This tests shared_ptr is working okay. It also checks that there are no memory leaks in the
// class that shared_ptr is pointing via a counting mechanism in the constructors and destructor of Klass. // class that shared_ptr is pointing via a counting mechanism in the constructors and destructor of Klass.
// In order to test that there are no leaks of the shared_ptr class itself (as it is created on the heap) // In order to test that there are no leaks of the shared_ptr class itself (as it is created on the heap)
// the runtime tests can be run for a long time to monitor memory leaks using memory monitor tools // the runtime tests can be run for a long time to monitor memory leaks using memory monitor tools
// like 'top'. There is a wrapper for shared_ptr in shared_ptr_wrapper.h which enables one to // like 'top'. There is a wrapper for shared_ptr in shared_ptr_wrapper.h which enables one to
// count the instances of shared_ptr. Uncomment the SHARED_PTR_WRAPPER macro to turn this on. // count the instances of shared_ptr. Uncomment the SHARED_PTR_WRAPPER macro to turn this on.
// //
@ -11,6 +11,16 @@
%warnfilter(SWIGWARN_TYPEMAP_SWIGTYPELEAK); %warnfilter(SWIGWARN_TYPEMAP_SWIGTYPELEAK);
#if defined(SWIGSCILAB)
%rename(MbrVar) MemberVariables;
%rename(MbrVal) MemberVariables::MemberValue;
%rename(MbrPtr) MemberVariables::MemberPointer;
%rename(MbrRef) MemberVariables::MemberReference;
%rename(SmartMbrVal) MemberVariables::SmartMemberValue;
%rename(SmartMbrPtr) MemberVariables::SmartMemberPointer;
%rename(SmartMbrRef) MemberVariables::SmartMemberReference;
#endif
%inline %{ %inline %{
#include "boost/shared_ptr.hpp" #include "boost/shared_ptr.hpp"
#include "swig_examples_lock.h" #include "swig_examples_lock.h"
@ -93,7 +103,7 @@ struct Klass {
static int getTotal_count() { return total_count; } static int getTotal_count() { return total_count; }
private: private:
// lock increment and decrement as a destructor could be called at the same time as a // lock increment and decrement as a destructor could be called at the same time as a
// new object is being created - C# / Java, at least, have finalizers run in a separate thread // new object is being created - C# / Java, at least, have finalizers run in a separate thread
static SwigExamples::CriticalSection critical_section; static SwigExamples::CriticalSection critical_section;
static void increment() { SwigExamples::Lock lock(critical_section); total_count++; if (debug_shared) cout << " ++xxxxx Klass::increment tot: " << total_count << endl;} static void increment() { SwigExamples::Lock lock(critical_section); total_count++; if (debug_shared) cout << " ++xxxxx Klass::increment tot: " << total_count << endl;}
@ -104,15 +114,15 @@ private:
}; };
SwigExamples::CriticalSection Space::Klass::critical_section; SwigExamples::CriticalSection Space::Klass::critical_section;
struct IgnoredMultipleInheritBase { struct IgnoredMultipleInheritBase {
IgnoredMultipleInheritBase() : d(0.0), e(0.0) {} IgnoredMultipleInheritBase() : d(0.0), e(0.0) {}
virtual ~IgnoredMultipleInheritBase() {} virtual ~IgnoredMultipleInheritBase() {}
double d; double d;
double e; double e;
virtual void AVirtualMethod() {} virtual void AVirtualMethod() {}
}; };
// For most compilers, this use of multiple inheritance results in different derived and base class // For most compilers, this use of multiple inheritance results in different derived and base class
// pointer values ... for some more challenging tests :) // pointer values ... for some more challenging tests :)
struct KlassDerived : IgnoredMultipleInheritBase, Klass { struct KlassDerived : IgnoredMultipleInheritBase, Klass {
KlassDerived() : Klass() {} KlassDerived() : Klass() {}
@ -254,7 +264,7 @@ long use_count(const SwigBoost::shared_ptr<KlassDerived>& sptr) {
long use_count(const SwigBoost::shared_ptr<Klass>& sptr) { long use_count(const SwigBoost::shared_ptr<Klass>& sptr) {
return sptr.use_count(); return sptr.use_count();
} }
const SwigBoost::shared_ptr<Klass>& ref_1() { const SwigBoost::shared_ptr<Klass>& ref_1() {
static SwigBoost::shared_ptr<Klass> sptr; static SwigBoost::shared_ptr<Klass> sptr;
return sptr; return sptr;
} }
@ -334,7 +344,11 @@ template <class T1, class T2> struct Base {
}; };
%} %}
#if not defined(SWIGSCILAB)
%template(BaseIntDouble) Base<int, double>; %template(BaseIntDouble) Base<int, double>;
#else
%template(BaseIDbl) Base<int, double>;
#endif
%inline %{ %inline %{
template <class T1, class T2> struct Pair : Base<T1, T2> { template <class T1, class T2> struct Pair : Base<T1, T2> {
@ -356,9 +370,9 @@ SwigBoost::shared_ptr< Pair<int, double> > pair_id1(SwigBoost::shared_ptr< Pair<
%inline %{ %inline %{
namespace SwigBoost { namespace SwigBoost {
const int NOT_COUNTING = -123456; const int NOT_COUNTING = -123456;
int shared_ptr_wrapper_count() { int shared_ptr_wrapper_count() {
#ifdef SHARED_PTR_WRAPPER #ifdef SHARED_PTR_WRAPPER
return SwigBoost::SharedPtrWrapper::getTotalCount(); return SwigBoost::SharedPtrWrapper::getTotalCount();
#else #else
return NOT_COUNTING; return NOT_COUNTING;
#endif #endif