Skip to content

Commit b24fcb3

Browse files
committed
Revert "python: improve swig bindings"
This commit breaks our Houdini/Swig integration. The root cause is that our swig version needs to be upgraded, so pull this back for now. This reverts commit 73b02b2.
1 parent 04f047d commit b24fcb3

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/py/partio.i

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
4141
#define SWIG_PYTHON_2_UNICODE
4242
%}
4343

44-
%include "std_pair.i"
4544
%include "std_string.i"
4645
%include "std_map.i"
4746

48-
namespace std {
49-
%template(StringMap) map<string, string>;
50-
%template() pair<string, string>;
51-
}
52-
53-
5447
%{
5548
#include <Partio.h>
5649
#include <PartioIterator.h>
@@ -609,6 +602,7 @@ void merge(ParticlesDataMutable& base, const ParticlesData& delta, const std::st
609602
* it manually. To do this, simply use the empty template instantiation, that
610603
* is, %template with no name.
611604
*/
605+
%template() std::map<std::string, std::string>;
612606

613607
/* typemap to convert Python arguments into an attrNameMap std::map pointer. */
614608
%typemap(in) const std::map<std::string, std::string> * attrNameMap (std::map<std::string, std::string> temp) {

0 commit comments

Comments
 (0)