# HG changeset patch # User Sebastien Jodogne # Date 1520967759 -3600 # Node ID 4da803580da959e955b56d0c28d012668211ff7d # Parent db21c1810c89471ee625a1ed55ffd5f894f21af0 remove macro ORTHANC_STONE_FORCE_INLINE diff -r db21c1810c89 -r 4da803580da9 Framework/Volumes/VolumeReslicer.cpp --- 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 -#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(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(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(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(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