refs #4201 Fixing unix error

mantidproject · Jan 3, 2012 · c145318 · c145318
1 parent 546699e
commit c145318
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
@@ -20,7 +20,7 @@ die() {
 	echo '-----------------------' 1>&2
 	echo '' 1>&2
 	echo "$@" 1>&2
-	exit 1
+	return
 }
 
 zero='0000000000000000000000000000000000000000'

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp
@@ -773,7 +773,7 @@ template< Q_state Q, AnalMode MODE, CnvrtUnits CONV >
 class LOOP_ND{
   public:
     static inline void EXEC(ConvertToMDEvents *pH){
-            LOOP_ND<Q, MODE,CnvrtUnits(int(CONV)-1)>::EXEC(pH);
+            LOOP_ND<Q, MODE,static_cast<CnvrtUnits>(static_cast<int>(CONV)-1)>::EXEC(pH);
 
             std::string Key = pH->Q_modes[Q]+pH->dE_modes[MODE]+pH->ConvModes[CONV];