View | Details | Raw Unified | Return to bug 186817
Collapse All | Expand All

(-)./Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/devel/swig20/Makefile 339666 2014-01-14 09:01:38Z koobs $
2
# $FreeBSD: head/devel/swig20/Makefile 339666 2014-01-14 09:01:38Z koobs $
3
3
4
PORTNAME=	swig
4
PORTNAME=	swig
5
PORTVERSION=	2.0.11
5
PORTVERSION=	2.0.12
6
CATEGORIES=	devel
6
CATEGORIES=	devel
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
8
8
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (swig-2.0.11.tar.gz) = 63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e
1
SHA256 (swig-2.0.12.tar.gz) = 65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7
2
SIZE (swig-2.0.11.tar.gz) = 5310295
2
SIZE (swig-2.0.12.tar.gz) = 5312394
(-)./files/patch-Lib__std__std_container.i (-53 lines)
Lines 1-53 Link Here
1
--- ./Lib/std/std_container.i.orig	2014-01-12 12:49:23.125903702 +1100
2
+++ ./Lib/std/std_container.i	2014-01-12 17:22:07.027709014 +1100
3
@@ -46,8 +46,14 @@
4
   void resize(size_type new_size);
5
   
6
   #ifdef SWIG_EXPORT_ITERATOR_METHODS
7
-  iterator erase(iterator pos);
8
-  iterator erase(iterator first, iterator last);
9
+// Backport C++11 support
10
+// Issue ID: https://github.com/swig/swig/issues/73
11
+// Commit: https://github.com/swig/swig/commit/92128eef445f75f674894e3f5d4e1fc2a1818957
12
+%extend {
13
+  // %extend wrapper used for differing definitions of these methods introduced in C++11
14
+  iterator erase(iterator pos) { return $self->erase(pos); }
15
+  iterator erase(iterator first, iterator last) { return $self->erase(first, last); }
16
+}
17
   #endif
18
   
19
 %enddef
20
@@ -68,8 +74,14 @@
21
   void resize(size_type new_size, const value_type& x);
22
   
23
   #ifdef SWIG_EXPORT_ITERATOR_METHODS
24
-  iterator insert(iterator pos, const value_type& x);
25
-  void insert(iterator pos, size_type n, const value_type& x);
26
+// Backport C++11 support
27
+// Issue ID: https://github.com/swig/swig/issues/73
28
+// Commit: https://github.com/swig/swig/commit/92128eef445f75f674894e3f5d4e1fc2a1818957
29
+%extend {
30
+  // %extend wrapper used for differing definitions of these methods introduced in C++11
31
+  iterator insert(iterator pos, const value_type& x) { return $self->insert(pos, x); }
32
+  void insert(iterator pos, size_type n, const value_type& x) { $self->insert(pos, n, x); }
33
+}
34
   #endif
35
   
36
 %enddef
37
@@ -89,8 +101,14 @@
38
   void resize(size_type new_size, value_type x);
39
   
40
   #ifdef SWIG_EXPORT_ITERATOR_METHODS
41
-  iterator insert(iterator pos, value_type x);
42
-  void insert(iterator pos, size_type n, value_type x);
43
+// Backport C++11 support
44
+// Issue ID: https://github.com/swig/swig/issues/73
45
+// Commit: https://github.com/swig/swig/commit/92128eef445f75f674894e3f5d4e1fc2a1818957
46
+%extend {
47
+  // %extend wrapper used for differing definitions of these methods introduced in C++11
48
+  iterator insert(iterator pos, value_type x) { return $self->insert(pos, x); }
49
+  void insert(iterator pos, size_type n, value_type x) { $self->insert(pos, n, x); }
50
+}
51
   #endif
52
   
53
 %enddef
(-)./files/patch-Lib__std__std_map.i (-20 lines)
Lines 1-20 Link Here
1
--- ./Lib/std/std_map.i.orig	2014-01-12 17:22:34.464286699 +1100
2
+++ ./Lib/std/std_map.i	2014-01-12 17:25:54.847499215 +1100
3
@@ -12,9 +12,14 @@
4
   size_type count(const key_type& x) const;
5
 
6
 #ifdef SWIG_EXPORT_ITERATOR_METHODS
7
-//  iterator insert(iterator position, const value_type& x);
8
-  void erase(iterator position);
9
-  void erase(iterator first, iterator last);
10
+// Backport C++11 support
11
+// Issue ID: https://github.com/swig/swig/issues/73
12
+// Commit: https://github.com/swig/swig/commit/92128eef445f75f674894e3f5d4e1fc2a1818957
13
+%extend {
14
+  // %extend wrapper used for differing definitions of these methods introduced in C++11
15
+  void erase(iterator position) { $self->erase(position); }
16
+  void erase(iterator first, iterator last) { $self->erase(first, last); }
17
+}
18
 
19
   iterator find(const key_type& x);
20
   iterator lower_bound(const key_type& x);
(-)./files/patch-Lib__std__std_set.i (-19 lines)
Lines 1-19 Link Here
1
--- ./Lib/std/std_set.i.orig	2014-01-12 17:24:56.140822773 +1100
2
+++ ./Lib/std/std_set.i	2014-01-12 17:25:47.509154979 +1100
3
@@ -29,8 +29,14 @@
4
   reverse_iterator rbegin();
5
   reverse_iterator rend();
6
 
7
-  void erase(iterator pos);
8
-  void erase(iterator first, iterator last);
9
+// Backport C++11 support
10
+// Issue ID: https://github.com/swig/swig/issues/73
11
+// Commit: https://github.com/swig/swig/commit/92128eef445f75f674894e3f5d4e1fc2a1818957
12
+%extend {
13
+  // %extend wrapper used for differing definitions of these methods introduced in C++11
14
+  void erase(iterator pos) { $self->erase(pos); }
15
+  void erase(iterator first, iterator last) { $self->erase(first, last); }
16
+}
17
 
18
   iterator find(const key_type& x);
19
   iterator lower_bound(const key_type& x);

Return to bug 186817