Merge pull request #1164 from lukaszstolarczuk/fixes

Fixes

Author: igchor

include/libpmemobj++/persistent_ptr.hpp

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2015-2020, Intel Corporation */
+/* Copyright 2015-2021, Intel Corporation */
 
 /**
  * @file
@@ -576,7 +576,10 @@ class persistent_ptr : public persistent_ptr_base {
 	inline ptrdiff_t
 	calculate_offset() const
 	{
-		static const ptrdiff_t ptr_offset_magic = 0xDEADBEEF;
+		static const ptrdiff_t ptr_offset_magic = 0xF00000000000000;
+
+		static_assert(ptr_offset_magic % alignof(U) == 0, "");
+		static_assert(ptr_offset_magic % alignof(T) == 0, "");
 
 		U *tmp{reinterpret_cast<U *>(ptr_offset_magic)};
 		T *diff = static_cast<T *>(tmp);

tests/radix_tree/radix_concurrent_erase.cpp

@@ -176,8 +176,9 @@ test_erase_increment(nvobj::pool<root> &pop,
 						  it->value() == v);
 					if (it != ptr->end()) {
 						auto next = ++it;
-						UT_ASSERT(next != ptr->end());
-						UT_ASSERT(next->key() > k);
+						if (next != ptr->end())
+							UT_ASSERT(next->key() >
+								  k);
 					}
 				});
 			}