From 40d7f4137e97b2814b2405bef6372b8edcc67454 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 14 Feb 2019 07:38:49 +0000 Subject: [PATCH] typedef declaration corrections for std::array --- Lib/java/std_array.i | 10 ++++++---- Lib/std/std_array.i | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Lib/java/std_array.i b/Lib/java/std_array.i index 0944d932f..f67b18d9b 100644 --- a/Lib/java/std_array.i +++ b/Lib/java/std_array.i @@ -11,12 +11,14 @@ namespace std { typedef size_t size_type; typedef ptrdiff_t difference_type; typedef T value_type; - typedef T &reference; - typedef const T &const_reference; - typedef T *pointer; - typedef const T *const_pointer; + typedef value_type* pointer; + typedef const value_type* const_pointer; + typedef value_type& reference; + typedef const value_type& const_reference; + array(); array(const array& other); + size_type size() const; %rename(isEmpty) empty; bool empty() const; diff --git a/Lib/std/std_array.i b/Lib/std/std_array.i index aadc3b80c..3f70ef57c 100644 --- a/Lib/std/std_array.i +++ b/Lib/std/std_array.i @@ -53,8 +53,8 @@ namespace std { typedef _Tp value_type; typedef value_type* pointer; typedef const value_type* const_pointer; - typedef _Tp& reference; - typedef const _Tp& const_reference; + typedef value_type& reference; + typedef const value_type& const_reference; %traits_swigtype(_Tp); %traits_enum(_Tp);