Skip to content

Commit

Permalink
included std_vector typemap while avoiding java compile error
Browse files Browse the repository at this point in the history
  • Loading branch information
cwidmer committed Jun 15, 2012
1 parent 5477eb7 commit 5423ead
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/.generate_link_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
deps['enumtypeunsafe.swg']=[]
deps['exception.i']=[]
deps['stdint.i']=[]
deps['std_vector.i']=[]
deps['modshogun_doxygen.i']=[]

modular_deps=['modshogun_doxygen.i']
Expand Down
8 changes: 8 additions & 0 deletions src/interfaces/modular/SGBase.i
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,14 @@ public void readExternal(java.io.ObjectInput in) throws java.io.IOException, jav

%include "swig_typemaps.i"

#if !defined(SWIGJAVA)
%include "std_vector.i"
namespace std {
%template(IntStdVector) vector<int32_t>;
%template(DoubleStdVector) vector<float64_t>;
}
#endif

#ifndef SWIGR
%include <shogun/base/init.h>
#endif
Expand Down

0 comments on commit 5423ead

Please sign in to comment.