Merge pull request #728 from igchor/merge_stable_1.7_into_stable_1.8

Merge stable 1.7 into stable 1.8

Author: lukaszstolarczuk

include/libpmemobj++/container/detail/contiguous_iterator.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Intel Corporation
+ * Copyright 2018-2020, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -175,7 +175,7 @@ struct contiguous_iterator {
 	/**
 	 * Element access operator.
 	 */
-	Reference operator[](std::size_t n)
+	Reference operator[](std::ptrdiff_t n)
 	{
 		return ptr[n];
 	}
@@ -259,7 +259,7 @@ struct range_snapshotting_iterator
 	 *
 	 * Adds element to a transaction.
 	 */
-	reference operator[](std::size_t n)
+	reference operator[](std::ptrdiff_t n)
 	{
 		detail::conditional_add_to_tx(&this->ptr[n], 1,
 					      POBJ_XADD_ASSUME_INITIALIZED);
@@ -409,7 +409,7 @@ struct basic_contiguous_iterator
 	 *
 	 * Adds range containing specified element to a transaction.
 	 */
-	reference operator[](std::size_t n)
+	reference operator[](std::ptrdiff_t n)
 	{
 		detail::conditional_add_to_tx(&this->ptr[n], 1,
 					      POBJ_XADD_ASSUME_INITIALIZED);

include/libpmemobj++/slice.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Intel Corporation
+ * Copyright 2018-2020, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -134,7 +134,8 @@ class slice {
 		if (idx >= size())
 			throw std::out_of_range("pmem::obj::slice");
 
-		return it_begin[idx];
+		return it_begin[static_cast<typename std::iterator_traits<
+			Iterator>::difference_type>(idx)];
 	}
 
 	/**
@@ -143,7 +144,8 @@ class slice {
 	 */
 	reference operator[](size_type idx)
 	{
-		return it_begin[idx];
+		return it_begin[static_cast<typename std::iterator_traits<
+			Iterator>::difference_type>(idx)];
 	}
 
 	size_type

tests/array_iterator/array_iterator.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Intel Corporation
+ * Copyright 2018-2020, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -64,7 +64,7 @@ struct Test1 {
 
 		swap(it, it2);
 
-		it2[c.size() - 1] = 10;
+		it2[static_cast<std::ptrdiff_t>(c.size() - 1)] = 10;
 		it[20] = 20;
 
 		UT_ASSERT(c[c.size() - 1] == 10);