version 1.4.5

cran · Jan 30, 2023 · 8bf2efe · 8bf2efe
1 parent 2e8befa
commit 8bf2efe
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: RNifti
-Version: 1.4.4
-Date: 2023-01-16
+Version: 1.4.5
+Date: 2023-01-30
 Title: Fast R and C++ Access to NIfTI Images
 Authors@R: c(person("Jon", "Clayden", role=c("cre","aut"),
     email="code@clayden.org", comment=c(ORCID="0000-0002-6608-0619")),
@@ -27,7 +27,7 @@ BugReports: https://github.com/jonclayden/RNifti/issues
 Encoding: UTF-8
 RoxygenNote: 7.1.1
 NeedsCompilation: yes
-Packaged: 2023-01-16 21:33:09 UTC; jon
+Packaged: 2023-01-30 12:16:52 UTC; jon
 Author: Jon Clayden [cre, aut] (<https://orcid.org/0000-0002-6608-0619>),
   Bob Cox [aut],
   Mark Jenkinson [aut],
@@ -38,4 +38,4 @@ Author: Jon Clayden [cre, aut] (<https://orcid.org/0000-0002-6608-0619>),
   Mark Adler [cph]
 Maintainer: Jon Clayden <code@clayden.org>
 Repository: CRAN
-Date/Publication: 2023-01-16 22:10:02 UTC
+Date/Publication: 2023-01-30 15:00:23 UTC
diff --git a/MD5 b/MD5
@@ -1,6 +1,6 @@
-88ee64ead89035ba571c82b0fc832824 *DESCRIPTION
+501ad9d93dc4640ab08dd100b01b6134 *DESCRIPTION
 b94d5d2bf459e2903296147cf718349d *NAMESPACE
-037aa55c82d66ffc008e70be6478deac *NEWS
+e29b44d29b4be4e021252388db636a95 *NEWS
 48127c25699df64079656e5eb7fcd1d2 *R/extensions.R
 a45b6c1b24ab18fa3818f783bf93a84c *R/image.R
 1ccc6cc2864f9b51e267aa0965586087 *R/nifti.R
@@ -18,7 +18,7 @@ bad67894bda1a1b3b135369d6c07df6a *inst/extdata/example.nii.gz
 e8547f4bc7609814adfbab6fe9c1c288 *inst/extdata/example_4d.nii.gz
 c26818fcb45b7b7a9d4154d5487230e1 *inst/extdata/example_rgb.nii.gz
 84e1b4e8cafbfa7cf9fa29df7391178a *inst/include/RNifti.h
-d9878c1b6575dbf64443df1d33094394 *inst/include/RNifti/NiftiImage.h
+f7ecf8fecfae4af654a775f645beb9c7 *inst/include/RNifti/NiftiImage.h
 fca64f7adf5edf33953181e26fddf3cb *inst/include/RNifti/NiftiImage_impl.h
 f80b24dc1fac288092c6758dfe0b36f3 *inst/include/RNifti/NiftiImage_matrix.h
 f930d3f1090d3f9bb525ebc114e3410d *inst/include/RNifti/NiftiImage_print.h

diff --git a/NEWS b/NEWS
@@ -2,6 +2,12 @@ Significant changes to the RNifti package are laid out below for each release.
 
 ===============================================================================
 
+VERSION 1.4.5
+
+- The package now works around the deprecation of `std::iterator` in C++17.
+
+===============================================================================
+
 VERSION 1.4.4
 
 - Calls to the unsafe C function `sprintf()` have been removed or worked

diff --git a/inst/include/RNifti/NiftiImage.h b/inst/include/RNifti/NiftiImage.h
@@ -349,14 +349,21 @@ class NiftiImageData
     /**
      * Iterator type for \c NiftiImageData, with \c Element as its value type
     **/
-    class Iterator : public std::iterator<std::random_access_iterator_tag, Element>
+    class Iterator
     {
     private:
         const NiftiImageData &parent;
         void *ptr;
         size_t step;
 
     public:
+        // Standard iterator typedefs
+        typedef std::random_access_iterator_tag iterator_category;
+        typedef Element value_type;
+        typedef std::ptrdiff_t difference_type;
+        typedef Element* pointer;
+        typedef Element& reference;
+
         /**
          * Primary constructor
          * @param parent A reference to the parent object