From: Timo Heister Date: Sun, 12 Jul 2015 21:42:02 +0000 (-0400) Subject: avoid compiler warnings on windows X-Git-Tag: v8.3.0-rc1~17^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74f5c8b8f6818017e125fe280049e42fff122d63;p=dealii.git avoid compiler warnings on windows --- diff --git a/source/base/logstream.cc b/source/base/logstream.cc index e9254eecb3..cb5c979896 100644 --- a/source/base/logstream.cc +++ b/source/base/logstream.cc @@ -527,6 +527,10 @@ LogStream::timestamp () #else const double time = 0.; const unsigned int tick = 100; + current_tms.tms_utime = 0; + current_tms.tms_stime = 0; + current_tms.tms_cutime = 0; + current_tms.tms_cstime = 0; #endif (*this) << "Wall: " << time - reference_time_val << " User: " << 1./tick * (current_tms.tms_utime - reference_tms.tms_utime) diff --git a/source/base/utilities.cc b/source/base/utilities.cc index 6625a2bfcc..040aeeaab3 100644 --- a/source/base/utilities.cc +++ b/source/base/utilities.cc @@ -654,6 +654,7 @@ namespace Utilities // Windows does not appear to have posix_memalign. just use the // regular malloc in that case *memptr = malloc (size); + (void)alignment; AssertThrow (*memptr != 0, ExcOutOfMemory()); #endif }