mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Merge branch 'upstream-diy' into clang_warnings
* upstream-diy: diy 2019-04-09 (f7a68da4)
This commit is contained in:
commit
5cc0d03f64
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user