move clitkConfiguration.h out of clitkCommon to avoid costly recompilations

fix harmless warning

diff --git a/.vimrc b/.vimrc
index 216453c7c430d734e032406cb46e48321f4f1b41..97cf20f9b8ab76ae4ee5a3be96f6c0ded7e15e7b 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -6,5 +6,5 @@ set expandtab
 "set cino={.5s,e-.5s,^-.5s
 set shiftwidth=2
 
-set makeprg=${HOME}/clitk3/fast_make.sh
+set makeprg=${HOME}/workspace/cvs/clitk3/fast_make.sh
 set grepprg=clgrep

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index 879d54f613b7e2cceefddbcbd2ad371d7b4868bd..52264cd0258d8f1131a17e3b247b707f624e52d2 100644 (file)
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -20,7 +20,7 @@
 #define CLITKCOMMON_H
 
 // clitk include
-#include "clitkConfiguration.h"
+//#include "clitkConfiguration.h"
 #include "clitkPortability.h"
 #include "clitkExceptionObject.h"
 

diff --git a/fast_make.sh b/fast_make.sh
index 38d94a187816b9820e034c420a9a910976b88886..0ee2e4fa360a2dc857998abbd70c8158bfdd733a 100755 (executable)
--- a/fast_make.sh
+++ b/fast_make.sh
@@ -35,39 +35,39 @@ nice -n12 ionice -c3 make -j ${cpus} $@ &
 make_pid=$(jobs -p %nice)
 
 #watch memory use to avoid crashes
-#while ps $make_pid >>/dev/null 
-#do
-#    if [ x"$(ps aux | grep cc1plus | grep -v grep | wc -l)" != x0 ]
-#    then
-#        ps ax -o vsize,comm | grep cc1plus | grep -o "\<[0-9]*\>" > mem_use
-#        used_mem=$(awk 'BEGIN {sum=0;} {sum+=$1;} END {print sum;}' mem_use)
-#        if (( "$used_mem"> ($available_mem - 300) ))
-#        then
-#            touch memory_exhausted_lock
-#            echo "Stopping due to exagerated memory use ( $used_mem )"
-#            handle_exit
-#        elif (( "$used_mem"> ($available_mem/2) ))
-#        then
-#            if [ x$high_mem != xtrue ]
-#            then
-#                echo "Warning, high memory use, not spawning any more compilation jobs... ( $used_mem )"
-#                killall -s SIGSTOP make
-#                killall -s SIGCONT cc1plus
-#                high_mem="true"
-#                date_mem=$(date +%s)
-#            fi
-#            echo mem $used_mem / $available_mem
-#        elif [ x$high_mem = xtrue ] && (( $(date +%s) > ( $date_mem + 5 ) ))
-#        then
-#            echo "Memory use back to normal"
-#            high_mem=""
-#            killall -s SIGCONT make
-#        fi
-#        rm mem_use
-#    fi
-#    sleep 1
-#done
-#rm memory_exhausted_lock 2>>/dev/null
+while ps $make_pid >>/dev/null 
+do
+    if [ x"$(ps aux | grep cc1plus | grep -v grep | wc -l)" != x0 ]
+    then
+        ps ax -o vsize,comm | grep cc1plus | grep -o "\<[0-9]*\>" > mem_use
+        used_mem=$(awk 'BEGIN {sum=0;} {sum+=$1;} END {print sum;}' mem_use)
+        if (( "$used_mem"> ($available_mem - 300) ))
+        then
+            touch memory_exhausted_lock
+            echo "Stopping due to exagerated memory use ( $used_mem )"
+            handle_exit
+        elif (( "$used_mem"> ($available_mem/2) ))
+        then
+            if [ x$high_mem != xtrue ]
+            then
+                echo "Warning, high memory use, not spawning any more compilation jobs... ( $used_mem )"
+                killall -s SIGSTOP make
+                killall -s SIGCONT cc1plus
+                high_mem="true"
+                date_mem=$(date +%s)
+            fi
+            echo mem $used_mem / $available_mem
+        elif [ x$high_mem = xtrue ] && (( $(date +%s) > ( $date_mem + 5 ) ))
+        then
+            echo "Memory use back to normal"
+            high_mem=""
+            killall -s SIGCONT make
+        fi
+        rm mem_use
+    fi
+    sleep 1
+done
+rm memory_exhausted_lock 2>>/dev/null
 wait
 echo Done!
 echo

diff --git a/vv/vvImageReader.txx b/vv/vvImageReader.txx
index af11299b9e4497f0a715636ae864b866745992ce..9393392bf53770ea99f417ccffe84ee41804dc9d 100644 (file)
--- a/vv/vvImageReader.txx
+++ b/vv/vvImageReader.txx
@@ -27,6 +27,7 @@
 #include <vtkTransform.h>
 
 #include "clitkCommon.h"
+#include "clitkConfiguration.h"
 #include "vvFromITK.h"
 #include "vvConstants.h"
 

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 22d75bea432ca7d4a26dc8b61e2f01cd57b1f94f..aa5b5cc7cf9a74e93d2bfa66074a7cebf57075ea 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -44,6 +44,7 @@
 #include "vvStructSelector.h"
 #include "vvMeshReader.h"
 #include "vvConstants.h"
+#include "clitkConfiguration.h"
 
 // ITK include
 #include "itkImage.h"

diff --git a/vv/vvMeshActor.cxx b/vv/vvMeshActor.cxx
index e72587117a423a1c607fc14c4dbcb047e4d1bad9..cefd281172e9af0eb767bfcecf89e0d69e4245cd 100644 (file)
--- a/vv/vvMeshActor.cxx
+++ b/vv/vvMeshActor.cxx
@@ -26,7 +26,7 @@
 #include <cassert>
 
 vvMeshActor::vvMeshActor() :
-  mCutDimension(NULL), mMesh(NULL),
+  mCutDimension(0), mMesh(NULL),
   mMarching(NULL), mMapper(NULL),
   mActor(NULL),
   mSuperpostionMode(false), mTimeSlice(0)

diff --git a/vv/vvThreadedFilter.cxx b/vv/vvThreadedFilter.cxx
index 0262126b71f9c666d613d0d49eb71ae0a82d50af..0a074f37e312b31ed4528224830a1d8d3ad40217 100644 (file)
--- a/vv/vvThreadedFilter.cxx
+++ b/vv/vvThreadedFilter.cxx
@@ -70,7 +70,7 @@ void vvThreadedFilter::Update()
       }
       temp = m_FilterBase->GetCurrentStepName();
     }
-    this->wait(200); // in milisecond
+    this->wait(200); // in miliseconds
     qApp->processEvents();
   }
 }