sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use std::string as is convention and comment last bit of unused mutex support in connection manager

Browse source
This commit is contained in:
Dane Springmeyer 2011-11-19 11:35:07 -08:00
parent 7491d08b67
commit bb38fa986a
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
plugins/input/postgis/connection_manager.hpp
View file

@ -24,6 +24,7 @@
#define CONNECTION_MANAGER_HPP
#include <string>
#include <sstream>
#include <mapnik/pool.hpp>
#include <mapnik/utils.hpp>
#include "connection.hpp"
@ -33,25 +34,24 @@
#ifdef MAPNIK_THREADSAFE
#include <boost/thread/mutex.hpp>
using boost::mutex;
//using boost::mutex;
#endif
using mapnik::Pool;
using mapnik::singleton;
using mapnik::CreateStatic;
using std::string;
template <typename T>
class ConnectionCreator
{
public:
ConnectionCreator(boost::optional<string> const& host,
boost::optional<string> const& port,
boost::optional<string> const& dbname,
boost::optional<string> const& user,
boost::optional<string> const& pass,
boost::optional<string> const& connect_timeout)
ConnectionCreator(boost::optional<std::string> const& host,
boost::optional<std::string> const& port,
boost::optional<std::string> const& dbname,
boost::optional<std::string> const& user,
boost::optional<std::string> const& pass,
boost::optional<std::string> const& connect_timeout)
: host_(host),
port_(port),
dbname_(dbname),
@ -83,12 +83,12 @@ public:
}
private:
boost::optional<string> host_;
boost::optional<string> port_;
boost::optional<string> dbname_;
boost::optional<string> user_;
boost::optional<string> pass_;
boost::optional<string> connect_timeout_;
boost::optional<std::string> host_;
boost::optional<std::string> port_;
boost::optional<std::string> dbname_;
boost::optional<std::string> user_;
boost::optional<std::string> pass_;
boost::optional<std::string> connect_timeout_;
};
class ConnectionManager : public singleton <ConnectionManager,CreateStatic>