fixing broken build

patflick · Sep 19, 2016 · b3ab1d4 · b3ab1d4
1 parent 57c9229
commit b3ab1d4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/experimental/new_datatype.hpp b/experimental/new_datatype.hpp
@@ -196,15 +196,33 @@ struct buffer_decl {
  typedef buf_instance<buffer_decl<T, U, S>> instance_type;
 
  // pointer to member
- S T::* size;
- U* T::* buf;
+ S T::* m_size;
+ U* T::* m_buf;
 
  instance_type instance_wrapper(T& t) {
  return instance_type(*this, t);
  }
 
- constexpr buffer_decl(S T::* size, U* T::* buf) : size(size), buf(buf) {}
- constexpr buffer_decl(const buffer_decl& o) : size(o.size), buf(o.buf) {}
+ inline size_type size(const T& instance) const {
+ return instance.*m_size;
+ }
+
+ inline const value_type* data(const T& instance) const {
+ return instance.*m_buf;
+ }
+
+ inline value_type* data(T& instance) const {
+ return instance.*m_buf;
+ }
+
+ inline void resize(T& instance, size_type size) {
+ // TODO dealloc?
+ instance.*m_size = size;
+ instance.*m_buf = new value_type[size];
+ }
+
+ constexpr buffer_decl(S T::* size, U* T::* buf) : m_size(size), m_buf(buf) {}
+ constexpr buffer_decl(const buffer_decl& o) : m_size(o.size), m_buf(o.buf) {}
 };
 
 
@@ -334,7 +352,7 @@ struct is_simple_type_helper<T, typename std::enable_if<
  > {};
 
 template <typename T>
-struct is_simple_type : public is_simple_type_helper<T> {};
+struct is_simple_type : is_simple_type_helper<T> {};
 
 
 template <typename T, typename Alloc>

diff --git a/experimental/sendrecv.hpp b/experimental/sendrecv.hpp
@@ -10,7 +10,7 @@
 namespace mxx {
 
 template <typename T>
-typename std::enable_if<mxx::is_trivial_type<T>::value, void>::type
+typename std::enable_if<mxx::is_simple_type<T>::value, void>::type
 sendrecv(const T* send_data, size_t send_count, int target, T* recv_buf, size_t recv_count, int src, const mxx::comm& c) {
  mxx::datatype dt = mxx::get_datatype<T>();
  if (send_count >= mxx::max_int || recv_count >= mxx::max_int) {
@@ -26,7 +26,7 @@ sendrecv(const T* send_data, size_t send_count, int target, T* recv_buf, size_t
 
 
 template <typename T>
-typename std::enable_if<mxx::is_trivial_type<T>::value, T>::type
+typename std::enable_if<mxx::is_simple_type<T>::value, T>::type
 sendrecv(const T& value, int target, int src, const mxx::comm& c) {
  mxx::datatype dt = mxx::get_datatype<T>();
  T result = T();

diff --git a/include/mxx/datatypes.hpp b/include/mxx/datatypes.hpp
@@ -296,7 +296,7 @@ struct datatype_name {
  datatype_name(datatype_name&& o) = default;
 };
 
-std::ostream& operator<<(std::ostream& os, const datatype_name& n) {
+inline std::ostream& operator<<(std::ostream& os, const datatype_name& n) {
  return os << "(" << n.mpi_name << "," << n.c_name << "," << n.typeid_name << ")";
 }