summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-09-26 19:51:31 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2015-09-26 19:51:59 +0100
commitbb8a122b00c2ba3485a2dd81d0c611b498f77055 (patch)
treede9d89446c2d90b19383bf99d80a6cc5163c759a
parentAdd macro to instantiate factories that take no parameters (diff)
downloadlibadhocutil-bb8a122b00c2ba3485a2dd81d0c611b498f77055.tar.bz2
libadhocutil-bb8a122b00c2ba3485a2dd81d0c611b498f77055.tar.xz
libadhocutil-bb8a122b00c2ba3485a2dd81d0c611b498f77055.zip
Unambiguous create function name
-rw-r--r--libadhocutil/factory.h2
-rw-r--r--libadhocutil/factory.impl.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libadhocutil/factory.h b/libadhocutil/factory.h
index f1998a7..1765f50 100644
--- a/libadhocutil/factory.h
+++ b/libadhocutil/factory.h
@@ -46,7 +46,7 @@ namespace AdHoc {
* @param name The name of the implementation.
* @param p The parameters to pass to the constructor.
*/
- static Base * create(const std::string & name, const Params & ... p);
+ static Base * createNew(const std::string & name, const Params & ... p);
};
}
diff --git a/libadhocutil/factory.impl.h b/libadhocutil/factory.impl.h
index c6d4719..bbba002 100644
--- a/libadhocutil/factory.impl.h
+++ b/libadhocutil/factory.impl.h
@@ -17,7 +17,7 @@ namespace AdHoc {
template <typename Base, typename ... Params>
Base *
- Factory<Base, Params...>::create(const std::string & name, const Params & ... p)
+ Factory<Base, Params...>::createNew(const std::string & name, const Params & ... p)
{
return get(name)->create(p...);
}