]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Undo r26920 since that appears to have led to numerous testsuite failures.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Oct 2012 12:31:45 +0000 (12:31 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Oct 2012 12:31:45 +0000 (12:31 +0000)
git-svn-id: https://svn.dealii.org/trunk@27002 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/source/base/thread_management.cc

index e439ecd9063e3b2fab2aa5c2d39fbda96ebdb07b..7549689b4827ca483a588ca15f91083ebfd2dcfc 100644 (file)
@@ -148,10 +148,10 @@ namespace Threads
 
   unsigned int this_thread_id ()
   {
-#if HAVE_GETPID
-    const pid_t this_id = getpid();
-#elif SYS_gettid
+#ifdef SYS_gettid
     const int this_id = syscall(SYS_gettid);
+#elif HAVE_GETPID
+    const pid_t this_id = getpid();
 #else
 #  ifdef DEAL_II_MSVC
     const unsigned int this_id = 0;

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.