Merge pull request #2259 from mkuron/endian

Fix PARTIAL_PERIODIC on big-endian platforms
espressomd · Sep 13, 2018 · 252091d · 252091d
2 parents e437080 + 81f9b86
commit 252091d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/core/global.cpp b/src/core/global.cpp
@@ -147,7 +147,7 @@ const std::unordered_map<int, Datafield> fields{
      {&nptiso.piston, Datafield::Type::DOUBLE, 1,
       "npt_piston"}}, /* 27 from pressure.cpp */
     {FIELD_PERIODIC,
-     {&periodic, Datafield::Type::BOOL, 3,
+     {&periodic, Datafield::Type::INT, 1,
       "periodicity"}}, /* 28 from grid.cpp */
     {FIELD_SKIN,
      {&skin, Datafield::Type::DOUBLE, 1, "skin"}}, /* 29 from integrate.cpp */

diff --git a/src/core/utils/serialization/List.hpp b/src/core/utils/serialization/List.hpp
@@ -20,6 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CORE_UTILS_SERIALIZATION_LIST_HPP
 
 #include <boost/serialization/array.hpp>
+#if BOOST_VERSION >= 106400 && BOOST_VERSION < 106500
+#include <boost/serialization/array_wrapper.hpp>
+#endif
 #include <boost/serialization/split_free.hpp>
 
 #include "core/utils/List.hpp"