fix warnings

This commit is contained in:
Joachim Schöberl 2019-08-07 18:31:10 +02:00
parent 88af66d5a0
commit 1698a71754
2 changed files with 4 additions and 4 deletions

View File

@ -629,12 +629,12 @@ namespace ngcore
static_assert(detail::all_of_tmpl<std::is_base_of<Bases,T>::value...>, static_assert(detail::all_of_tmpl<std::is_base_of<Bases,T>::value...>,
"Variadic template arguments must be base classes of T"); "Variadic template arguments must be base classes of T");
detail::ClassArchiveInfo info {}; detail::ClassArchiveInfo info {};
info.creator = [this,&info](const std::type_info& ti) -> void* info.creator = [](const std::type_info& ti) -> void*
{ return typeid(T) == ti ? detail::constructIfPossible<T>() { return typeid(T) == ti ? detail::constructIfPossible<T>()
: Archive::Caster<T, Bases...>::tryUpcast(ti, detail::constructIfPossible<T>()); }; : Archive::Caster<T, Bases...>::tryUpcast(ti, detail::constructIfPossible<T>()); };
info.upcaster = [this](const std::type_info& ti, void* p) -> void* info.upcaster = [/*this*/](const std::type_info& ti, void* p) -> void*
{ return typeid(T) == ti ? p : Archive::Caster<T, Bases...>::tryUpcast(ti, static_cast<T*>(p)); }; { return typeid(T) == ti ? p : Archive::Caster<T, Bases...>::tryUpcast(ti, static_cast<T*>(p)); };
info.downcaster = [this](const std::type_info& ti, void* p) -> void* info.downcaster = [/*this*/](const std::type_info& ti, void* p) -> void*
{ return typeid(T) == ti ? p : Archive::Caster<T, Bases...>::tryDowncast(ti, p); }; { return typeid(T) == ti ? p : Archive::Caster<T, Bases...>::tryDowncast(ti, p); };
Archive::SetArchiveRegister(std::string(Demangle(typeid(T).name())),info); Archive::SetArchiveRegister(std::string(Demangle(typeid(T).name())),info);
} }

View File

@ -247,9 +247,9 @@ namespace ngcore
struct TNestedTask struct TNestedTask
{ {
const function<void(TaskInfo&)> * func; const function<void(TaskInfo&)> * func;
atomic<int> * endcnt;
int mynr; int mynr;
int total; int total;
atomic<int> * endcnt;
TNestedTask () { ; } TNestedTask () { ; }
TNestedTask (const function<void(TaskInfo&)> & _func, TNestedTask (const function<void(TaskInfo&)> & _func,