BUG: Msvc2017 fixes

Source/Common/imstkDataArray.h

@@ -44,10 +44,12 @@ public:
         using self_type  = iterator;
         using value_type = T;
         using iterator_category = std::forward_iterator_tag;
-        using difference_type   = int;
+        using difference_type   = std::ptrdiff_t;
+        using pointer   = T*;
+        using reference = T&;
 
     public:
-        iterator(value_type* ptr) : ptr_(ptr) { }
+        iterator(pointer ptr) : ptr_(ptr) { }
 
         self_type operator++()
         {
@@ -62,16 +64,16 @@ public:
             return *this;
         }
 
-        value_type& operator*() { return *ptr_; }
+        reference operator*() { return *ptr_; }
 
-        value_type* operator->() { return ptr_; }
+        pointer operator->() { return ptr_; }
 
         bool operator==(const self_type& rhs) { return ptr_ == rhs.ptr_; }
 
         bool operator!=(const self_type& rhs) { return ptr_ != rhs.ptr_; }
 
     private:
-        value_type* ptr_;
+        pointer ptr_;
     };
 
     class const_iterator
@@ -80,10 +82,12 @@ public:
         using self_type  = const_iterator;
         using value_type = T;
         using iterator_category = std::forward_iterator_tag;
-        using difference_type   = int;
+        using difference_type   = std::ptrdiff_t;
+        using pointer   = T*;
+        using reference = T&;
 
     public:
-        const_iterator(value_type* ptr) : ptr_(ptr) { }
+        const_iterator(pointer ptr) : ptr_(ptr) { }
 
         self_type operator++()
         {
@@ -94,16 +98,16 @@ public:
 
         self_type operator++(int junk) { ptr_++; return *this; }
 
-        const value_type& operator*() { return *ptr_; }
+        const reference operator*() { return *ptr_; }
 
-        const value_type* operator->() { return ptr_; }
+        const pointer operator->() { return ptr_; }
 
         bool operator==(const self_type& rhs) { return ptr_ == rhs.ptr_; }
 
         bool operator!=(const self_type& rhs) { return ptr_ != rhs.ptr_; }
 
     private:
-        value_type* ptr_;
+        pointer ptr_;
     };
 
 public:
@@ -216,6 +220,11 @@ public:
         }
     }
 
+    ///
+    /// \brief Fill the array with the specified value
+    ///
+    inline void fill(const T& val) { std::fill_n(m_data, m_size, val); }
+
     ///
     /// \brief Resize to current size
     ///

Source/Common/imstkVecDataArray.h

@@ -45,10 +45,12 @@ public:
         using self_type  = iterator;
         using value_type = VecType;
         using iterator_category = std::forward_iterator_tag;
-        using difference_type   = int;
+        using difference_type   = std::ptrdiff_t;
+        using pointer   = VecType*;
+        using reference = VecType&;
 
     public:
-        iterator(value_type* ptr) : ptr_(ptr) { }
+        iterator(pointer ptr) : ptr_(ptr) { }
 
         self_type operator++()
         {
@@ -63,16 +65,16 @@ public:
             return *this;
         }
 
-        value_type& operator*() { return *ptr_; }
+        reference operator*() { return *ptr_; }
 
-        value_type* operator->() { return ptr_; }
+        pointer operator->() { return ptr_; }
 
         bool operator==(const self_type& rhs) { return ptr_ == rhs.ptr_; }
 
         bool operator!=(const self_type& rhs) { return ptr_ != rhs.ptr_; }
 
     private:
-        value_type* ptr_;
+        pointer ptr_;
     };
 
     class const_iterator
@@ -81,10 +83,12 @@ public:
         using self_type  = const_iterator;
         using value_type = VecType;
         using iterator_category = std::forward_iterator_tag;
-        using difference_type   = int;
+        using difference_type   = std::ptrdiff_t;
+        using pointer   = VecType*;
+        using reference = VecType&;
 
     public:
-        const_iterator(value_type* ptr) : ptr_(ptr) { }
+        const_iterator(pointer ptr) : ptr_(ptr) { }
 
         self_type operator++()
         {
@@ -95,16 +99,16 @@ public:
 
         self_type operator++(int junk) { ptr_++; return *this; }
 
-        const value_type& operator*() { return *ptr_; }
+        const reference operator*() { return *ptr_; }
 
-        const value_type* operator->() { return ptr_; }
+        const pointer operator->() { return ptr_; }
 
         bool operator==(const self_type& rhs) { return ptr_ == rhs.ptr_; }
 
         bool operator!=(const self_type& rhs) { return ptr_ != rhs.ptr_; }
 
     private:
-        value_type* ptr_;
+        pointer ptr_;
     };
 
 public:
@@ -196,6 +200,8 @@ public:
         }
     }
 
+    inline void fill(const VecType& val) { std::fill_n(m_dataCast, m_vecSize, val); }
+
     inline int size() const { return m_vecSize; }
 
     inline void squeeze() override { resize(m_vecSize); }