Skip to content

Commit

Permalink
fix Lib/std/std unordered containers
Browse files Browse the repository at this point in the history
  • Loading branch information
@tamuratak
tamuratak committed Jan 28, 2017
1 parent 2ab08e4 commit 9cb9098
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 39 deletions.
10 changes: 4 additions & 6 deletions Lib/std/std_container.i
View file
Expand Up @@ -26,19 +26,17 @@
class const_iterator;
iterator begin();
iterator end();
#endif

%enddef

%define %std_container_methods_reverse_iterators(container...)

#ifdef SWIG_EXPORT_ITERATOR_METHODS
#if !defined(SWIG_NO_REVERSE_ITERATOR_METHODS)
class reverse_iterator;
class const_reverse_iterator;
reverse_iterator rbegin();
reverse_iterator rend();
#endif

#endif


%enddef

// Common container methods
Expand Down
21 changes: 9 additions & 12 deletions Lib/std/std_unordered_map.i
View file
Expand Up @@ -4,7 +4,7 @@
// operator--() and constructor(compare function) not available for unordered_
// types
//

#define SWIG_NO_REVERSE_ITERATOR_METHODS
%include <std_pair.i>
%include <std_container.i>

Expand All @@ -22,8 +22,6 @@
}

iterator find(const key_type& x);
iterator lower_bound(const key_type& x);
iterator upper_bound(const key_type& x);
#endif
%enddef

Expand Down Expand Up @@ -68,7 +66,7 @@

namespace std {

template<class _Key, class _Tp, class _Compare = std::less< _Key >,
template<class _Key, class _Tp, class _Hash = std::hash< _Key >, class _Pred = std::equal_to< _Key >,
class _Alloc = allocator<std::pair< const _Key, _Tp > > >
class unordered_map {
public:
Expand Down Expand Up @@ -101,29 +99,28 @@ namespace std {
}
}

%fragment(SWIG_Traits_frag(std::unordered_map< _Key, _Tp, _Compare, _Alloc >), "header",
%fragment(SWIG_Traits_frag(std::unordered_map< _Key, _Tp, _Hash, _Pred, _Alloc >), "header",
fragment=SWIG_Traits_frag(std::pair< _Key, _Tp >),
fragment="StdMapTraits") {
fragment="StdUnorderedMapTraits") {
namespace swig {
template <> struct traits<std::unordered_map< _Key, _Tp, _Compare, _Alloc > > {
template <> struct traits<std::unordered_map< _Key, _Tp, _Hash, _Pred, _Alloc > > {
typedef pointer_category category;
static const char* type_name() {
return "std::unordered_map<" #_Key "," #_Tp "," #_Compare "," #_Alloc " >";
return "std::unordered_map<" #_Key "," #_Tp "," #_Hash "," #_Pred "," #_Alloc " >";
}
};
}
}

%typemap_traits_ptr(SWIG_TYPECHECK_MAP, std::unordered_map< _Key, _Tp, _Compare, _Alloc >);

unordered_map( const _Compare& );
%typemap_traits_ptr(SWIG_TYPECHECK_MAP, std::unordered_map< _Key, _Tp, _Hash, _Pred, _Alloc >);

#ifdef %swig_unordered_map_methods
// Add swig/language extra methods
%swig_unordered_map_methods(std::unordered_map< _Key, _Tp, _Compare, _Alloc >);
%swig_unordered_map_methods(std::unordered_map< _Key, _Tp, _Hash, _Pred, _Alloc >);
#endif

%std_unordered_map_methods(unordered_map);
};

}
#undef SWIG_NO_REVERSE_ITERATOR_METHODS
21 changes: 10 additions & 11 deletions Lib/std/std_unordered_multimap.i
View file
Expand Up @@ -6,10 +6,10 @@
//

%include <std_unordered_map.i>

#define SWIG_NO_REVERSE_ITERATOR_METHODS

%define %std_unordered_multimap_methods(mmap...)
%std_map_methods_common(mmap);
%std_unordered_map_methods_common(mmap);

#ifdef SWIG_EXPORT_ITERATOR_METHODS
std::pair<iterator,iterator> equal_range(const key_type& x);
Expand Down Expand Up @@ -44,7 +44,7 @@


namespace std {
template<class _Key, class _Tp, class _Compare = std::less< _Key >,
template<class _Key, class _Tp, class _Hash = std::hash< _Key >, class _Pred = std::equal_to< _Key >,
class _Alloc = allocator<std::pair< const _Key, _Tp > > >
class unordered_multimap {
public:
Expand All @@ -63,28 +63,27 @@ namespace std {
%traits_swigtype(_Key);
%traits_swigtype(_Tp);

%fragment(SWIG_Traits_frag(std::unordered_multimap< _Key, _Tp, _Compare, _Alloc >), "header",
%fragment(SWIG_Traits_frag(std::unordered_multimap< _Key, _Tp, _Hash, _Pred, _Alloc >), "header",
fragment=SWIG_Traits_frag(std::pair< _Key, _Tp >),
fragment="StdMultimapTraits") {
fragment="StdUnorderedMultimapTraits") {
namespace swig {
template <> struct traits<std::unordered_multimap< _Key, _Tp, _Compare, _Alloc > > {
template <> struct traits<std::unordered_multimap< _Key, _Tp, _Hash, _Pred, _Alloc > > {
typedef pointer_category category;
static const char* type_name() {
return "std::unordered_multimap<" #_Key "," #_Tp "," #_Compare "," #_Alloc " >";
return "std::unordered_multimap<" #_Key "," #_Tp "," #_Hash "," #_Pred "," #_Alloc " >";
}
};
}
}

%typemap_traits_ptr(SWIG_TYPECHECK_MULTIMAP, std::unordered_multimap< _Key, _Tp, _Compare, _Alloc >);
%typemap_traits_ptr(SWIG_TYPECHECK_MULTIMAP, std::unordered_multimap< _Key, _Tp, _Hash, _Pred, _Alloc >);

unordered_multimap( const _Compare& );

#ifdef %swig_unordered_multimap_methods
// Add swig/language extra methods
%swig_unordered_multimap_methods(std::unordered_multimap< _Key, _Tp, _Compare, _Alloc >);
%swig_unordered_multimap_methods(std::unordered_multimap< _Key, _Tp, _Hash, _Pred, _Alloc >);
#endif

%std_unordered_multimap_methods(unordered_multimap);
};
}
#undef SWIG_NO_REVERSE_ITERATOR_METHODS
15 changes: 7 additions & 8 deletions Lib/std/std_unordered_multiset.i
View file
Expand Up @@ -43,7 +43,8 @@ namespace std {

//unordered_multiset

template <class _Key, class _Compare = std::less< _Key >,
template <class _Key, class _Hash = std::hash< _Key >,
class _Compare = std::equal_to< _Key >,
class _Alloc = allocator< _Key > >
class unordered_multiset {
public:
Expand All @@ -59,26 +60,24 @@ namespace std {

%traits_swigtype(_Key);

%fragment(SWIG_Traits_frag(std::unordered_multiset< _Key, _Compare, _Alloc >), "header",
%fragment(SWIG_Traits_frag(std::unordered_multiset< _Key, _Hash, _Compare, _Alloc >), "header",
fragment=SWIG_Traits_frag(_Key),
fragment="StdMultisetTraits") {
namespace swig {
template <> struct traits<std::unordered_multiset< _Key, _Compare, _Alloc > > {
template <> struct traits<std::unordered_multiset< _Key, _Hash, _Compare, _Alloc > > {
typedef pointer_category category;
static const char* type_name() {
return "std::unordered_multiset<" #_Key "," #_Compare "," #_Alloc " >";
return "std::unordered_multiset<" #_Key "," #_Hash "," #_Compare "," #_Alloc " >";
}
};
}
}

%typemap_traits_ptr(SWIG_TYPECHECK_MULTISET, std::unordered_multiset< _Key, _Compare, _Alloc >);

unordered_multiset( const _Compare& );
%typemap_traits_ptr(SWIG_TYPECHECK_MULTISET, std::unordered_multiset< _Key, _Hash, _Compare, _Alloc >);

#ifdef %swig_unordered_multiset_methods
// Add swig/language extra methods
%swig_unordered_multiset_methods(std::unordered_multiset< _Key, _Compare, _Alloc >);
%swig_unordered_multiset_methods(std::unordered_multiset< _Key, _Hash, _Compare, _Alloc >);
#endif

%std_unordered_multiset_methods(unordered_multiset);
Expand Down
2 changes: 0 additions & 2 deletions Lib/std/std_unordered_set.i
View file
Expand Up @@ -110,8 +110,6 @@ namespace std {

%typemap_traits_ptr(SWIG_TYPECHECK_SET, std::unordered_set< _Key, _Hash, _Compare, _Alloc >);

unordered_set( const _Compare& );

#ifdef %swig_unordered_set_methods
// Add swig/language extra methods
%swig_unordered_set_methods(std::unordered_set< _Key, _Hash, _Compare, _Alloc >);
Expand Down

0 comments on commit 9cb9098

Please sign in to comment.