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

Fix 1832613 - template function pointer typedefs

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10195 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2007-12-16 20:55:43 +00:00
commit da509bd641
4 changed files with 80 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Examples/test-suite/common.mk
View file

@ -307,6 +307,7 @@ CPP_TEST_CASES += \
template_typedef_cplx3 \
template_typedef_cplx4 \
template_typedef_cplx5 \
template_typedef_funcptr \
template_typedef_ns \
template_typedef_ptr \
template_typedef_rec \

48
Examples/test-suite/template_typedef_funcptr.i Normal file
View file

@ -0,0 +1,48 @@
%module template_typedef_funcptr
//Bug #1832613
%include <std_string.i>
%inline %{
#include <string>
template<typename T> class Ptr {};
class MCContract {};
typedef Ptr<MCContract> MCContractPtr;
%}
%template() Ptr<MCContract>;
%inline %{
template <class Contract, typename ContractID, typename CallbackType>
class ContractFactory
{
public:
static ContractFactory<Contract,ContractID,CallbackType> &getInstance() {
static ContractFactory<Contract, ContractID, CallbackType> instance;
return instance;
}
};
/**
* CreateXXContractCallback is a pointer to a function taking no arguments and
* returning a pointer to an XXContract.
*/
typedef MCContractPtr (*CreateMCContractCallback)();
%}
//Get around it by changing this:
%template(MCContractFactory) ContractFactory<MCContract, std::string, CreateMCContractCallback>;
//to a form which expands the typedef:
//%template(MCContractFactory) ContractFactory<MCContract, std::string, Ptr<MCContract>(*)()>;
%inline %{
typedef MCContractPtr* ContractPtrPtr;
%}
// Plain pointers were also causing problems...
%template(MCContractFactory2) ContractFactory<MCContract, std::string, ContractPtrPtr>;