diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-11-25 03:02:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 03:02:16 -0800 |
| commit | 3a68fbe656c1984b6cf1b921d29225807d4d4ca0 (patch) | |
| tree | 3ffd25a72f89b320fff78412876e93f234df1832 /src | |
| parent | c4b5018ca57213601d0b31139be8c4268a308910 (diff) | |
| parent | 40dd0067af0dcf12c8723220bed29b0bea177dc8 (diff) | |
| download | astra-3a68fbe656c1984b6cf1b921d29225807d4d4ca0.tar.gz astra-3a68fbe656c1984b6cf1b921d29225807d4d4ca0.tar.bz2 astra-3a68fbe656c1984b6cf1b921d29225807d4d4ca0.tar.xz astra-3a68fbe656c1984b6cf1b921d29225807d4d4ca0.zip | |
Merge pull request #77 from wjp/singleton
Change order of template instantiations
Diffstat (limited to 'src')
| -rw-r--r-- | src/AstraObjectFactory.cpp | 6 | ||||
| -rw-r--r-- | src/AstraObjectManager.cpp | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/AstraObjectFactory.cpp b/src/AstraObjectFactory.cpp index 35132d0..1dda3b2 100644 --- a/src/AstraObjectFactory.cpp +++ b/src/AstraObjectFactory.cpp @@ -32,8 +32,8 @@ using namespace std; namespace astra { -DEFINE_SINGLETON2(CAstraObjectFactory<CAlgorithm, AlgorithmTypeList>); -DEFINE_SINGLETON2(CAstraObjectFactory<CProjector2D, Projector2DTypeList>); -DEFINE_SINGLETON2(CAstraObjectFactory<CProjector3D, Projector3DTypeList>); +DEFINE_SINGLETON2(CAstraObjectFactory<CAlgorithm, AlgorithmTypeList>) +DEFINE_SINGLETON2(CAstraObjectFactory<CProjector2D, Projector2DTypeList>) +DEFINE_SINGLETON2(CAstraObjectFactory<CProjector3D, Projector3DTypeList>) } // end namespace diff --git a/src/AstraObjectManager.cpp b/src/AstraObjectManager.cpp index 46eae4b..3b818d3 100644 --- a/src/AstraObjectManager.cpp +++ b/src/AstraObjectManager.cpp @@ -31,13 +31,13 @@ $Id$ namespace astra { -DEFINE_SINGLETON(CProjector2DManager); -DEFINE_SINGLETON(CProjector3DManager); -DEFINE_SINGLETON(CData2DManager); -DEFINE_SINGLETON(CData3DManager); -DEFINE_SINGLETON(CAlgorithmManager); -DEFINE_SINGLETON(CMatrixManager); - -DEFINE_SINGLETON(CAstraIndexManager); +DEFINE_SINGLETON(CProjector2DManager) +DEFINE_SINGLETON(CProjector3DManager) +DEFINE_SINGLETON(CData2DManager) +DEFINE_SINGLETON(CData3DManager) +DEFINE_SINGLETON(CAlgorithmManager) +DEFINE_SINGLETON(CMatrixManager) + +DEFINE_SINGLETON(CAstraIndexManager) } // end namespace |