Skip to content

Commit

Permalink
Moved PRAGMA() define outside openmp block.
Browse files Browse the repository at this point in the history
This means that our code base will now compile on non-openmp
compilers.  refs #6592 & #6345
  • Loading branch information
stuartcampbell committed Feb 19, 2013
1 parent 526dd6c commit 308c3c8
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions Code/Mantid/Framework/Kernel/inc/MantidKernel/MultiThreaded.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@ namespace Kernel
} //namespace
} //namespace



// _OPENMP is automatically defined if openMP support is enabled in the compiler.
#ifdef _OPENMP

// The syntax used to dfine a pragma within a macro is different on windows and GCC
#ifdef _MSC_VER
#ifdef _MSC_VER
#define PRAGMA __pragma
#else //_MSC_VER
#else //_MSC_VER
#define PRAGMA(x) _Pragma(#x)
#endif //_MSC_VER
#endif //_MSC_VER

// _OPENMP is automatically defined if openMP support is enabled in the compiler.
#ifdef _OPENMP

#include <omp.h>

Expand Down

0 comments on commit 308c3c8

Please sign in to comment.