summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Simmons <andrew.simmons@gmail.com>2013-07-08 17:29:24 -0500
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2013-07-25 18:23:45 +0100
commit5f1fff1849285f46cfaffadff0352cf976ea4c52 (patch)
tree58a51837e3d286ff165fc85035254cc274415b41
parent83178a1fe40844c2438bcad871c6cf510bf9c03e (diff)
downloadswig-5f1fff1849285f46cfaffadff0352cf976ea4c52.tar.gz
Copied std::pair<> fragment from Lib/std/std_map.i into Lib/std/std_multimap.i. This fixes an error when a std::multimap template is wrapped by itself.
-rw-r--r--Lib/std/std_multimap.i14
1 files changed, 14 insertions, 0 deletions
diff --git a/Lib/std/std_multimap.i b/Lib/std/std_multimap.i
index f165e5f33..5a2cf38d7 100644
--- a/Lib/std/std_multimap.i
+++ b/Lib/std/std_multimap.i
@@ -60,6 +60,20 @@ namespace std {
%traits_swigtype(_Key);
%traits_swigtype(_Tp);
+ %fragment(SWIG_Traits_frag(std::pair< _Key, _Tp >), "header",
+ fragment=SWIG_Traits_frag(_Key),
+ fragment=SWIG_Traits_frag(_Tp),
+ fragment="StdPairTraits") {
+ namespace swig {
+ template <> struct traits<std::pair< _Key, _Tp > > {
+ typedef pointer_category category;
+ static const char* type_name() {
+ return "std::pair<" #_Key "," #_Tp " >";
+ }
+ };
+ }
+ }
+
%fragment(SWIG_Traits_frag(std::multimap<_Key, _Tp, _Compare, _Alloc >), "header",
fragment=SWIG_Traits_frag(std::pair<_Key, _Tp >),
fragment="StdMultimapTraits") {