diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-07-12 22:20:58 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-07-12 22:20:58 +0100 |
| commit | f036bfce69ffef18ce4e15a2af7e1e5fc10a6846 (patch) | |
| tree | 9251ffcff61b308825822899e07921091efe91c3 | |
| parent | Add inline options class for testing inline macros (diff) | |
| download | icetray-f036bfce69ffef18ce4e15a2af7e1e5fc10a6846.tar.bz2 icetray-f036bfce69ffef18ce4e15a2af7e1e5fc10a6846.tar.xz icetray-f036bfce69ffef18ce4e15a2af7e1e5fc10a6846.zip | |
Remove the need for non-inline options classes to be explicitly regisitered
| -rw-r--r-- | icetray/icetray/options.h | 1 | ||||
| -rw-r--r-- | icetray/unittests/testOptions.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/icetray/icetray/options.h b/icetray/icetray/options.h index 15c4740..349959c 100644 --- a/icetray/icetray/options.h +++ b/icetray/icetray/options.h @@ -57,6 +57,7 @@ namespace IceTray { #define ICETRAY_OPTIONS_INLINE(OptsDef) \ void ICETRAY_OPTIONS_FUNC ICETRAY_OPTIONS_BODY(OptsDef) #define ICETRAY_OPTIONS(Class, OptsDef) \ + FACTORY(Class, IceTray::OptionsFactory); \ void Class::ICETRAY_OPTIONS_FUNC ICETRAY_OPTIONS_BODY(OptsDef) #endif diff --git a/icetray/unittests/testOptions.cpp b/icetray/unittests/testOptions.cpp index a205755..af5151c 100644 --- a/icetray/unittests/testOptions.cpp +++ b/icetray/unittests/testOptions.cpp @@ -10,8 +10,6 @@ ICETRAY_OPTIONS(TestOptions, ("vec", boost::program_options::value(&testVec), "vector") ); -FACTORY(TestOptions, IceTray::OptionsFactory); - class TestOptionsInline : public IceTray::Options { public: TestOptionsInline() : IceTray::Options("Test options inline") |