Mercurial > hg > orthanc-stone

changeset 180:4da803580da9 wasm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove macro ORTHANC_STONE_FORCE_INLINE
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 13 Mar 2018 20:02:39 +0100
parents db21c1810c89
children ff8556874557
files Framework/Volumes/VolumeReslicer.cpp
diffstat 1 files changed, 11 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Volumes/VolumeReslicer.cpp	Tue Mar 13 17:42:49 2018 +0100
+++ b/Framework/Volumes/VolumeReslicer.cpp	Tue Mar 13 20:02:39 2018 +0100
@@ -8,14 +8,6 @@
 
 #include <boost/math/special_functions/round.hpp>
 
-#if defined(_MSC_VER)
-#  define ORTHANC_STONE_FORCE_INLINE __forceinline
-#elif defined(__GNUC__) || defined(__clang__) || defined(__EMSCRIPTEN__)
-#  define ORTHANC_STONE_FORCE_INLINE inline __attribute((always_inline))
-#else
-#  error Please support your compiler here
-#endif
-
 
 namespace OrthancStone
 {
@@ -58,14 +50,14 @@
       }
 
     public:
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       void SetFloatValue(OutputPixelType* pixel,
                          float value) const
       {
         SetValueInternal<float>(pixel, value);
       }
       
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       void SetValue(OutputPixelType* pixel,
                     const InputPixelType& value) const
       {
@@ -108,14 +100,14 @@
       }
 
     public:
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       void SetFloatValue(OutputPixelType* pixel,
                          float value) const
       {
         SetValueInternal<float>(pixel, value);
       }
 
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       void SetValue(OutputPixelType* pixel,
                     const InputPixelType& value) const
       {
@@ -229,7 +221,7 @@
       {
       }
 
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       float GetFloatValue(float volumeX,
                           float volumeY,
                           float volumeZ) const
@@ -239,7 +231,7 @@
         return static_cast<float>(value);
       }
 
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       void GetValue(InputPixelType& target,
                     float volumeX,
                     float volumeY,
@@ -426,7 +418,7 @@
       {
       }
       
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       void Apply(typename PixelWriter::OutputPixelType* pixel,
                  float volumeX,
                  float volumeY,
@@ -455,7 +447,7 @@
       {
       }
       
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       void Apply(typename PixelWriter::OutputPixelType* pixel,
                  float volumeX,
                  float volumeY,
@@ -486,7 +478,7 @@
       {
       }
       
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       void Apply(typename PixelWriter::OutputPixelType* pixel,
                  float volumeX,
                  float volumeY,
@@ -537,7 +529,7 @@
         offset_[2] = static_cast<float>(tmp[2]);
       }
 
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       void Next()
       {
         position_[0] += offset_[0];
@@ -545,7 +537,7 @@
         position_[2] += offset_[2];
       }
 
-      ORTHANC_STONE_FORCE_INLINE
+      ORTHANC_FORCE_INLINE
       void GetVolumeCoordinates(float& x,
                                 float& y,
                                 float& z) const