X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffactory_filter.cpp;h=5fec9ddad22bda3123f9cb838c80c048cb4520ec;hb=73f37c91c144b070020df2f27472c09b62367acf;hp=89db983cc64573f8af2cc56e596256af5d39b637;hpb=e9530d6289df9b848e4901d7c73f5a2f27706d66;p=metaproxy-moved-to-github.git diff --git a/src/factory_filter.cpp b/src/factory_filter.cpp index 89db983..5fec9dd 100644 --- a/src/factory_filter.cpp +++ b/src/factory_filter.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2008 Index Data + Copyright (C) 2005-2012 Index Data Metaproxy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -33,7 +33,7 @@ namespace mp = metaproxy_1; namespace metaproxy_1 { class FactoryFilter::Rep { typedef std::map CallbackMap; - typedef std::map::iterator + typedef std::map::iterator CallbackMapIt; public: friend class FactoryFilter; @@ -66,8 +66,8 @@ mp::FactoryFilter::~FactoryFilter() } -bool mp::FactoryFilter::add_creator(std::string fi, - CreateFilterCallback cfc) +bool mp::FactoryFilter::add_creator(const std::string &fi, + CreateFilterCallback cfc) { return m_p->m_fcm.insert(Rep::CallbackMap::value_type(fi, cfc)).second; } @@ -81,7 +81,7 @@ bool mp::FactoryFilter::drop_creator(std::string fi) bool mp::FactoryFilter::exist(std::string fi) { Rep::CallbackMap::const_iterator it = m_p->m_fcm.find(fi); - + if (it == m_p->m_fcm.end()) { return false; @@ -92,7 +92,7 @@ bool mp::FactoryFilter::exist(std::string fi) mp::filter::Base* mp::FactoryFilter::create(std::string fi) { Rep::CallbackMap::const_iterator it = m_p->m_fcm.find(fi); - + if (it == m_p->m_fcm.end()){ std::string msg = "filter type '" + fi + "' not found"; throw NotFound(msg); @@ -124,13 +124,13 @@ bool mp::FactoryFilter::add_creator_dl(const std::string &fi, if (!dl_handle) { const char *dl = dlerror(); - std::cout << "dlopen " << full_path << " failed. dlerror=" << dl << + std::cout << "dlopen " << full_path << " failed. dlerror=" << dl << std::endl; return false; } std::string full_name = "metaproxy_1_filter_" + fi; - + void *dlsym_ptr = dlsym(dl_handle, full_name.c_str()); if (!dlsym_ptr) { @@ -147,8 +147,9 @@ bool mp::FactoryFilter::add_creator_dl(const std::string &fi, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +