Skip to content

Commit a5b4a43

Browse files
committed
Merge branch 'rfix-cleaned-up'
* rfix-cleaned-up: Whitespace cleanup in R testcase R shared_ptr fixes align implementation of smartname to r class name enable test for pointerreftest fixed by 752b7e8 switched implementation reference from java to python fixes from code review enable li_boost_shared_ptr in r-test-suite typo in comment fix naming of RClass when template of a shared_ptr
2 parents 4a8f7a9 + d238d10 commit a5b4a43

File tree

6 files changed

+703
-35
lines changed

6 files changed

+703
-35
lines changed

CHANGES.current

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
77
Version 4.1.0 (in progress)
88
===========================
99

10+
2022-10-24: wsfulton, AndLLA
11+
[R] #2386 Fix problems in shared_ptr wrappers where the class names
12+
were not consistent when using the shared_ptr template or the actual
13+
underlying type.
14+
1015
2022-10-24: wsfulton
1116
[R] Add support for special variable replacement in the $typemap()
1217
special variable macro for R specific typemaps (rtype, rtypecheck,

Examples/test-suite/li_boost_shared_ptr.i

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
# define SWIG_SHARED_PTR_NAMESPACE SwigBoost
4545
#endif
4646

47-
#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY)
47+
#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) || defined(SWIGOCTAVE) || defined(SWIGRUBY) || defined(SWIGR)
4848
#define SHARED_PTR_WRAPPERS_IMPLEMENTED
4949
#endif
5050

@@ -268,6 +268,7 @@ long use_count(const SwigBoost::shared_ptr<KlassDerived>& sptr) {
268268
long use_count(const SwigBoost::shared_ptr<Klass>& sptr) {
269269
return sptr.use_count();
270270
}
271+
271272
const SwigBoost::shared_ptr<Klass>& ref_1() {
272273
static SwigBoost::shared_ptr<Klass> sptr;
273274
return sptr;

0 commit comments

Comments
 (0)