From 17d636eec0ee0da346173066dd4f400a64e96c44 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 30 Jul 2013 20:59:41 -0700 Subject: gras: rename some factory functions --- lib/factory.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/factory.cpp') diff --git a/lib/factory.cpp b/lib/factory.cpp index 6d9fe2c..7115197 100644 --- a/lib/factory.cpp +++ b/lib/factory.cpp @@ -36,22 +36,22 @@ static FactoryRegistryType &get_factory_registry(void) static boost::mutex mutex; -void Factory::_register_make(const std::string &name, void *entry) +void Factory::_register_factory(const std::string &path, void *entry) { boost::mutex::scoped_lock l(mutex); - if (get_factory_registry().count(name) != 0) + if (get_factory_registry().count(path) != 0) { - std::cerr << "Warning: Factory - function already registered for name: " + name << std::endl; + std::cerr << "Warning: Factory - function already registered for path: " + path << std::endl; } - get_factory_registry()[name].reset(reinterpret_cast<FactoryRegistryEntry *>(entry)); + get_factory_registry()[path].reset(reinterpret_cast<FactoryRegistryEntry *>(entry)); } -Element *Factory::_handle_make(const std::string &name, const PMCC &args) +Element *Factory::_handle_make(const std::string &path, const PMCC &args) { boost::mutex::scoped_lock l(mutex); - if (get_factory_registry().count(name) == 0) + if (get_factory_registry().count(path) == 0) { - throw std::invalid_argument("Factory - no function registered for name: " + name); + throw std::invalid_argument("Factory - no function registered for path: " + path); } - return get_factory_registry()[name]->make(args); + return get_factory_registry()[path]->make(args); } -- cgit