Commit 5cc0d03f authored by Robert Maynard's avatar Robert Maynard

Merge branch 'upstream-diy' into clang_warnings

* upstream-diy:
  diy 2019-04-09 (f7a68da4)
parents 5c2f2ebc dbd3781d
......@@ -20,8 +20,8 @@ namespace internal {
template <class Char>
class FormatBuf : public std::basic_streambuf<Char> {
private:
using int_type = typename std::basic_streambuf<Char>::int_type;
using traits_type = typename std::basic_streambuf<Char>::traits_type;
typedef typename std::basic_streambuf<Char>::int_type int_type;
typedef typename std::basic_streambuf<Char>::traits_type traits_type;
Buffer<Char> &buffer_;
......@@ -81,7 +81,7 @@ void format_arg(BasicFormatter<Char, ArgFormatter_> &f,
output << value;
BasicStringRef<Char> str(&buffer[0], buffer.size());
using MakeArg = internal::MakeArg< BasicFormatter<Char> >;
typedef internal::MakeArg< BasicFormatter<Char> > MakeArg;
format_str = f.format(format_str, MakeArg(str));
}
......
......@@ -222,6 +222,6 @@ duplicate(const communicator& other)
#ifndef VTKM_DIY_NO_MPI
MPI_Comm newcomm;
MPI_Comm_dup(other.comm_, &newcomm);
(*this) = std::move(communicator(newcomm,true));
(*this) = communicator(newcomm,true);
#endif
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment