Commit 69f71009 authored by Caitlin Ross's avatar Caitlin Ross Committed by Kitware Robot

Merge topic 'update-diy'

cfacede5 Merge branch 'upstream-diy2' into update-diy
d890b443 diy2 2019-10-08 (80ba8295)
a5c441d8 intel compiler fix
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Merge-request: !6045
parents ee0c9688 cfacede5
Pipeline #148045 canceled with stage
in 0 seconds
......@@ -8,7 +8,7 @@ readonly name="diy2"
readonly ownership="Diy2 Upstream <kwrobot@kitware.com>"
readonly subtree="ThirdParty/$name/vtk$name"
readonly repo="https://gitlab.kitware.com/third-party/diy2.git"
readonly tag="for/vtk-20190913-master"
readonly tag="for/vtk-20191008-master"
readonly paths="
.gitattributes
CMakeLists.vtk.txt
......
......@@ -132,6 +132,12 @@
# endif
# endif
#endif
// Workaround broken [[deprecated]] in the Intel compiler.
#ifdef __INTEL_COMPILER
# define FMT_DEPRECATED_ALIAS
#else
# define FMT_DEPRECATED_ALIAS FMT_DEPRECATED
#endif
#ifndef FMT_BEGIN_NAMESPACE
# if FMT_HAS_FEATURE(cxx_inline_namespaces) || FMT_GCC_VERSION >= 404 || \
......@@ -474,8 +480,8 @@ class basic_parse_context : private ErrorHandler {
using format_parse_context = basic_parse_context<char>;
using wformat_parse_context = basic_parse_context<wchar_t>;
using parse_context FMT_DEPRECATED = basic_parse_context<char>;
using wparse_context FMT_DEPRECATED = basic_parse_context<wchar_t>;
using parse_context FMT_DEPRECATED_ALIAS = basic_parse_context<char>;
using wparse_context FMT_DEPRECATED_ALIAS = basic_parse_context<wchar_t>;
template <typename Context> class basic_format_arg;
template <typename Context> class basic_format_args;
......
......@@ -2441,7 +2441,7 @@ template <typename Handler, typename Char> struct id_adapter {
template <bool IS_CONSTEXPR, typename Char, typename Handler>
FMT_CONSTEXPR void parse_format_string(basic_string_view<Char> format_str,
Handler&& handler) {
struct writer {
struct pfs_writer {
FMT_CONSTEXPR void operator()(const Char* begin, const Char* end) {
if (begin == end) return;
for (;;) {
......@@ -2597,9 +2597,9 @@ void handle_dynamic_spec(Spec& value, arg_ref<typename Context::char_type> ref,
} // namespace internal
template <typename Range>
using basic_writer FMT_DEPRECATED = internal::basic_writer<Range>;
using writer FMT_DEPRECATED = internal::writer;
using wwriter FMT_DEPRECATED =
using basic_writer FMT_DEPRECATED_ALIAS = internal::basic_writer<Range>;
using writer FMT_DEPRECATED_ALIAS = internal::writer;
using wwriter FMT_DEPRECATED_ALIAS =
internal::basic_writer<internal::buffer_range<wchar_t>>;
/** The default argument formatter. */
......
......@@ -177,7 +177,7 @@ in(const RegularLink<Bounds>& link, //!< neighbors
neigh_bounds = link.bounds(n);
// wrap neighbor bounds, if necessary, otherwise bounds will be unchanged
wrap_bounds(neigh_bounds, link.wrap(n), domain, link.dimension());
wrap_bounds(neigh_bounds, link.wrap(n), domain);
if (distance(neigh_bounds, p) == 0)
*out++ = n;
......
......@@ -148,8 +148,8 @@ struct Profiler
void operator<<(std::string name) { enter(name); }
void operator>>(std::string name) { exit(name); }
void enter(std::string name) { total << name; }
void exit(std::string name) { total >> name; }
void enter(std::string name) {}
void exit(std::string name) {}
void output(std::ostream& out, std::string = "") const
{
......
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