diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-11-18 00:13:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 00:13:44 -0800 |
| commit | 1a092b53bddd7e31a3fcf12a13aabd404e91d215 (patch) | |
| tree | 8d53caf596aa17a81aa0ad5d276b0023c8cea517 | |
| parent | ed17faf4bc16a336eaa4aa0b5d64e84948716b6d (diff) | |
| parent | ad9f6e881f64173ea7cee2d20a04289f60f5eda3 (diff) | |
| download | astra-1a092b53bddd7e31a3fcf12a13aabd404e91d215.tar.gz astra-1a092b53bddd7e31a3fcf12a13aabd404e91d215.tar.bz2 astra-1a092b53bddd7e31a3fcf12a13aabd404e91d215.tar.xz astra-1a092b53bddd7e31a3fcf12a13aabd404e91d215.zip | |
Merge pull request #72 from buzmakov/master
Fix build with MS VS 2015 CE
| -rw-r--r-- | src/FanFlatBeamLineKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/FanFlatBeamStripKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/ParallelBeamBlobKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/ParallelBeamLineKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/ParallelBeamLinearKernelProjector2D.cpp | 1 | ||||
| -rw-r--r-- | src/ParallelBeamStripKernelProjector2D.cpp | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/src/FanFlatBeamLineKernelProjector2D.cpp b/src/FanFlatBeamLineKernelProjector2D.cpp index fd4195b..343144d 100644 --- a/src/FanFlatBeamLineKernelProjector2D.cpp +++ b/src/FanFlatBeamLineKernelProjector2D.cpp @@ -30,6 +30,7 @@ $Id$ #include <cmath> #include <cstring> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/FanFlatBeamStripKernelProjector2D.cpp b/src/FanFlatBeamStripKernelProjector2D.cpp index b48beab..6e2c518 100644 --- a/src/FanFlatBeamStripKernelProjector2D.cpp +++ b/src/FanFlatBeamStripKernelProjector2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/FanFlatBeamStripKernelProjector2D.h" #include <cmath> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/ParallelBeamBlobKernelProjector2D.cpp b/src/ParallelBeamBlobKernelProjector2D.cpp index 679d5c6..9b7c05f 100644 --- a/src/ParallelBeamBlobKernelProjector2D.cpp +++ b/src/ParallelBeamBlobKernelProjector2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/ParallelBeamBlobKernelProjector2D.h" #include <cmath> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/ParallelBeamLineKernelProjector2D.cpp b/src/ParallelBeamLineKernelProjector2D.cpp index e4a1bff..ccfb9f8 100644 --- a/src/ParallelBeamLineKernelProjector2D.cpp +++ b/src/ParallelBeamLineKernelProjector2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/ParallelBeamLineKernelProjector2D.h" #include <cmath> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/ParallelBeamLinearKernelProjector2D.cpp b/src/ParallelBeamLinearKernelProjector2D.cpp index 27aa168..2171e73 100644 --- a/src/ParallelBeamLinearKernelProjector2D.cpp +++ b/src/ParallelBeamLinearKernelProjector2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/ParallelBeamLinearKernelProjector2D.h" #include <cmath> +#include <algorithm> #include "astra/DataProjectorPolicies.h" diff --git a/src/ParallelBeamStripKernelProjector2D.cpp b/src/ParallelBeamStripKernelProjector2D.cpp index 3f4e7f3..a2869e2 100644 --- a/src/ParallelBeamStripKernelProjector2D.cpp +++ b/src/ParallelBeamStripKernelProjector2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/ParallelBeamStripKernelProjector2D.h" #include <cmath> +#include <algorithm> #include "astra/DataProjectorPolicies.h" |