]> https://gitweb.dealii.org/ - dealii.git/commitdiff
avoid compiler warnings on windows 1126/head
authorTimo Heister <timo.heister@gmail.com>
Sun, 12 Jul 2015 21:42:02 +0000 (17:42 -0400)
committerTimo Heister <timo.heister@gmail.com>
Sun, 12 Jul 2015 21:42:02 +0000 (17:42 -0400)
source/base/logstream.cc
source/base/utilities.cc

index e9254eecb3fac2720fbf6570db4feb99d1f41d0a..cb5c979896e5f546b5690cc17e8f7323f0675945 100644 (file)
@@ -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)
index 6625a2bfcc3689d0f24046e005e73285e68efe8c..040aeeaab37fe57b824833d95f668417a318470d 100644 (file)
@@ -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
     }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.