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

+ minor tweaks

Browse source
This commit is contained in:
artemp 2013-09-16 10:03:54 +01:00
parent 7495d2f381
commit 23b1948c6e
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
demo/viewer/viewer.pro
View file

@ -3,7 +3,8 @@
######################################################################
TEMPLATE = app
QT += core gui widgets
QMAKE_CXX = clang++
QMAKE_CXX = $$system(mapnik-config --cxx)
QMAKE_LINK = $$system(mapnik-config --cxx)
QMAKE_CXXFLAGS += $$system(mapnik-config --cxxflags)
QMAKE_CXXFLAGS += $$system(mapnik-config --includes --dep-includes)
QMAKE_LFLAGS += $$system(mapnik-config --libs)

15
plugins/input/postgis/asyncresultset.hpp
View file

@ -33,12 +33,12 @@
class postgis_processor_context;
typedef boost::shared_ptr<postgis_processor_context> postgis_processor_context_ptr;
class AsyncResultSet : public IResultSet, private boost::noncopyable
class AsyncResultSet : public IResultSet, private mapnik::noncopyable
{
public:
AsyncResultSet(postgis_processor_context_ptr const& ctx,
boost::shared_ptr< Pool<Connection,ConnectionCreator> > const& pool,
boost::shared_ptr<Connection> const &conn, const std::string& sql )
boost::shared_ptr<Connection> const& conn, std::string const& sql )
: ctx_(ctx),
pool_(pool),
conn_(conn),
@ -83,11 +83,11 @@ public:
rs_ = conn_->getAsyncResult();
}
else
{
{
throw mapnik::datasource_exception("invalid connection in AsyncResultSet::next");
}
}
next_res = rs_->next();
if (!next_res)
{
@ -172,7 +172,8 @@ private:
class postgis_processor_context : public mapnik::IProcessorContext
{
public:
postgis_processor_context():num_async_requests_(0) {}
postgis_processor_context()
: num_async_requests_(0) {}
~postgis_processor_context() {}
void add_request(boost::shared_ptr<AsyncResultSet> const& req)
@ -194,8 +195,8 @@ public:
int num_async_requests_;
private:
typedef std::queue<boost::shared_ptr<AsyncResultSet> > asynch_queue;
asynch_queue q_;
typedef std::queue<boost::shared_ptr<AsyncResultSet> > async_queue;
async_queue q_;
};