From f7cf9c4139ed621ba8027a384df7cd58dbee4a50 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 16 May 2006 11:53:53 +0000 Subject: [PATCH] Added a namespace qualifiers (mp::) --- src/filter_multi.cpp | 20 ++++++++++---------- src/filter_session_shared.cpp | 12 ++++++------ src/filter_virt_db.cpp | 20 ++++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/filter_multi.cpp b/src/filter_multi.cpp index d81734d..af9aee9 100644 --- a/src/filter_multi.cpp +++ b/src/filter_multi.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_multi.cpp,v 1.19 2006-05-15 20:47:26 adam Exp $ +/* $Id: filter_multi.cpp,v 1.20 2006-05-16 11:53:53 adam Exp $ Copyright (c) 2005-2006, Index Data. %LICENSE% @@ -128,7 +128,7 @@ yf::Multi::Frontend::~Frontend() { } -yf::Multi::FrontendPtr yf::Multi::Rep::get_frontend(Package &package) +yf::Multi::FrontendPtr yf::Multi::Rep::get_frontend(mp::Package &package) { boost::mutex::scoped_lock lock(m_mutex); @@ -153,7 +153,7 @@ yf::Multi::FrontendPtr yf::Multi::Rep::get_frontend(Package &package) return f; } -void yf::Multi::Rep::release_frontend(Package &package) +void yf::Multi::Rep::release_frontend(mp::Package &package) { boost::mutex::scoped_lock lock(m_mutex); std::map::iterator it; @@ -212,7 +212,7 @@ void yf::Multi::Backend::operator() (void) } -void yf::Multi::Frontend::close(Package &package) +void yf::Multi::Frontend::close(mp::Package &package) { std::list::const_iterator bit; for (bit = m_backend_list.begin(); bit != m_backend_list.end(); bit++) @@ -330,7 +330,7 @@ void yf::Multi::FrontendSet::round_robin(int start, int number, } } -void yf::Multi::Frontend::init(Package &package, Z_GDU *gdu) +void yf::Multi::Frontend::init(mp::Package &package, Z_GDU *gdu) { Z_InitRequest *req = gdu->u.z3950->u.initRequest; @@ -462,7 +462,7 @@ void yf::Multi::Frontend::init(Package &package, Z_GDU *gdu) package.response() = f_apdu; } -void yf::Multi::Frontend::search(Package &package, Z_APDU *apdu_req) +void yf::Multi::Frontend::search(mp::Package &package, Z_APDU *apdu_req) { // create search request Z_SearchRequest *req = apdu_req->u.searchRequest; @@ -596,7 +596,7 @@ void yf::Multi::Frontend::search(Package &package, Z_APDU *apdu_req) package.response() = f_apdu; // in this scope because of p } -void yf::Multi::Frontend::present(Package &package, Z_APDU *apdu_req) +void yf::Multi::Frontend::present(mp::Package &package, Z_APDU *apdu_req) { // create present request Z_PresentRequest *req = apdu_req->u.presentRequest; @@ -729,7 +729,7 @@ void yf::Multi::Frontend::present(Package &package, Z_APDU *apdu_req) package.response() = f_apdu; } -void yf::Multi::Frontend::scan1(Package &package, Z_APDU *apdu_req) +void yf::Multi::Frontend::scan1(mp::Package &package, Z_APDU *apdu_req) { if (m_backend_list.size() > 1) { @@ -820,7 +820,7 @@ Z_Entry *yf::Multi::ScanTermInfo::get_entry(ODR odr) return e; } -void yf::Multi::Frontend::scan2(Package &package, Z_APDU *apdu_req) +void yf::Multi::Frontend::scan2(mp::Package &package, Z_APDU *apdu_req) { Z_ScanRequest *req = apdu_req->u.scanRequest; @@ -1048,7 +1048,7 @@ void yf::Multi::Frontend::scan2(Package &package, Z_APDU *apdu_req) } -void yf::Multi::process(Package &package) const +void yf::Multi::process(mp::Package &package) const { FrontendPtr f = m_p->get_frontend(package); diff --git a/src/filter_session_shared.cpp b/src/filter_session_shared.cpp index 48aabee..f25ab3c 100644 --- a/src/filter_session_shared.cpp +++ b/src/filter_session_shared.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_session_shared.cpp,v 1.8 2006-05-15 10:34:40 adam Exp $ +/* $Id: filter_session_shared.cpp,v 1.9 2006-05-16 11:53:54 adam Exp $ Copyright (c) 2005-2006, Index Data. %LICENSE% @@ -129,7 +129,7 @@ bool yf::SessionShared::InitKey::operator < (const SessionShared::InitKey &k) return false; } -void yf::SessionShared::Frontend::init(Package &package, Z_GDU *gdu) +void yf::SessionShared::Frontend::init(mp::Package &package, Z_GDU *gdu) { Z_InitRequest *req = gdu->u.z3950->u.initRequest; @@ -157,7 +157,7 @@ yf::SessionShared::Frontend::Frontend(Rep *rep) : m_is_virtual(false), m_p(rep) { } -void yf::SessionShared::Frontend::close(Package &package) +void yf::SessionShared::Frontend::close(mp::Package &package) { #if 0 std::list::const_iterator b_it; @@ -178,7 +178,7 @@ yf::SessionShared::Frontend::~Frontend() { } -yf::SessionShared::FrontendPtr yf::SessionShared::Rep::get_frontend(Package &package) +yf::SessionShared::FrontendPtr yf::SessionShared::Rep::get_frontend(mp::Package &package) { boost::mutex::scoped_lock lock(m_mutex); @@ -203,7 +203,7 @@ yf::SessionShared::FrontendPtr yf::SessionShared::Rep::get_frontend(Package &pac return f; } -void yf::SessionShared::Rep::release_frontend(Package &package) +void yf::SessionShared::Rep::release_frontend(mp::Package &package) { boost::mutex::scoped_lock lock(m_mutex); std::map::iterator it; @@ -225,7 +225,7 @@ void yf::SessionShared::Rep::release_frontend(Package &package) } -void yf::SessionShared::process(Package &package) const +void yf::SessionShared::process(mp::Package &package) const { FrontendPtr f = m_p->get_frontend(package); diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp index 67b6750..b05539e 100644 --- a/src/filter_virt_db.cpp +++ b/src/filter_virt_db.cpp @@ -1,4 +1,4 @@ -/* $Id: filter_virt_db.cpp,v 1.39 2006-05-15 13:22:02 adam Exp $ +/* $Id: filter_virt_db.cpp,v 1.40 2006-05-16 11:53:54 adam Exp $ Copyright (c) 2005-2006, Index Data. %LICENSE% @@ -161,7 +161,7 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_databases( } yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( - std::list databases, Package &package, + std::list databases, mp::Package &package, int &error_code, std::string &addinfo) { BackendPtr b = create_backend_from_databases(databases, error_code, @@ -237,7 +237,7 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend( return b; } -void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req) +void yf::Virt_db::Frontend::search(mp::Package &package, Z_APDU *apdu_req) { Z_SearchRequest *req = apdu_req->u.searchRequest; std::string vhost; @@ -367,7 +367,7 @@ yf::Virt_db::Frontend::Frontend(Rep *rep) m_is_virtual = false; } -void yf::Virt_db::Frontend::close(Package &package) +void yf::Virt_db::Frontend::close(mp::Package &package) { std::list::const_iterator b_it; @@ -385,7 +385,7 @@ yf::Virt_db::Frontend::~Frontend() { } -yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package) +yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(mp::Package &package) { boost::mutex::scoped_lock lock(m_mutex); @@ -410,7 +410,7 @@ yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package) return f; } -void yf::Virt_db::Rep::release_frontend(Package &package) +void yf::Virt_db::Rep::release_frontend(mp::Package &package) { boost::mutex::scoped_lock lock(m_mutex); std::map::iterator it; @@ -478,7 +478,7 @@ void yf::Virt_db::Frontend::fixup_npr(Z_Records *records, std::string database, } } -void yf::Virt_db::Frontend::fixup_npr(Package &p, BackendPtr b) +void yf::Virt_db::Frontend::fixup_npr(mp::Package &p, BackendPtr b) { Z_GDU *gdu = p.response().get(); mp::odr odr; @@ -502,7 +502,7 @@ void yf::Virt_db::Frontend::fixup_npr(Package &p, BackendPtr b) } } -void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req) +void yf::Virt_db::Frontend::present(mp::Package &package, Z_APDU *apdu_req) { Z_PresentRequest *req = apdu_req->u.presentRequest; std::string resultSetId = req->resultSetId; @@ -547,7 +547,7 @@ void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req) delete id; } -void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req) +void yf::Virt_db::Frontend::scan(mp::Package &package, Z_APDU *apdu_req) { Z_ScanRequest *req = apdu_req->u.scanRequest; std::string vhost; @@ -633,7 +633,7 @@ void yf::Virt_db::add_map_db2target(std::string db, = Virt_db::Map(targets, route); } -void yf::Virt_db::process(Package &package) const +void yf::Virt_db::process(mp::Package &package) const { FrontendPtr f = m_p->get_frontend(package); -- 1.7.10.4