diff options
Diffstat (limited to 'project2/basics')
| -rw-r--r-- | project2/basics/Jamfile.jam | 2 | ||||
| -rw-r--r-- | project2/basics/caches/memoryCache.cpp | 2 | ||||
| -rw-r--r-- | project2/basics/tasks/iterate.cpp | 1 | ||||
| -rw-r--r-- | project2/basics/views/autotree.cpp | 2 | ||||
| -rw-r--r-- | project2/basics/views/flatView.cpp | 2 | ||||
| -rw-r--r-- | project2/basics/views/rowView.cpp | 9 | ||||
| -rw-r--r-- | project2/basics/views/singleton.cpp | 4 |
7 files changed, 7 insertions, 15 deletions
diff --git a/project2/basics/Jamfile.jam b/project2/basics/Jamfile.jam index c540c68..f8ea872 100644 --- a/project2/basics/Jamfile.jam +++ b/project2/basics/Jamfile.jam @@ -8,7 +8,6 @@ lib dl ; build-project unittests ; cpp-pch pch : pch.hpp : - <include>../../libmisc <library>glibmm <library>../common//p2common ; @@ -17,7 +16,6 @@ lib p2basics : [ glob-tree *.cpp : unittests ] : <include>. - <include>../../libmisc <library>glibmm <library>dl <library>boost_filesystem diff --git a/project2/basics/caches/memoryCache.cpp b/project2/basics/caches/memoryCache.cpp index 6e5aab6..2bec824 100644 --- a/project2/basics/caches/memoryCache.cpp +++ b/project2/basics/caches/memoryCache.cpp @@ -24,7 +24,7 @@ class MemoryCache : public RowSetCache { return *columns; } RowAttribute resolveAttr(const Glib::ustring & attrName) const { - return boost::bind(&safeMapLookup<AttributeDoesNotExist, AttrMap>, attrs, attrName); + return boost::bind(&AdHoc::safeMapLookup<AttributeDoesNotExist, AttrMap>, attrs, attrName); } private: friend class CachedRowSet; diff --git a/project2/basics/tasks/iterate.cpp b/project2/basics/tasks/iterate.cpp index ae73cdb..d2a767a 100644 --- a/project2/basics/tasks/iterate.cpp +++ b/project2/basics/tasks/iterate.cpp @@ -3,7 +3,6 @@ #include "logger.h" #include <boost/bind.hpp> #include "scriptLoader.h" -#include "scopeObject.h" DECLARE_LOADER("iterate", Iterate); diff --git a/project2/basics/views/autotree.cpp b/project2/basics/views/autotree.cpp index 2f5bb68..48cb643 100644 --- a/project2/basics/views/autotree.cpp +++ b/project2/basics/views/autotree.cpp @@ -1,9 +1,7 @@ #include <pch.hpp> #include "autotree.h" #include "presenter.h" -#include "scopeObject.h" #include "scriptLoader.h" -#include "scopeObject.h" #include <boost/bind.hpp> DECLARE_LOADER("autotree", AutoTree); diff --git a/project2/basics/views/flatView.cpp b/project2/basics/views/flatView.cpp index af49d0d..ad13105 100644 --- a/project2/basics/views/flatView.cpp +++ b/project2/basics/views/flatView.cpp @@ -1,9 +1,7 @@ #include "pch.hpp" #include "flatView.h" #include "presenter.h" -#include "scopeObject.h" #include "scriptLoader.h" -#include "scopeObject.h" #include <boost/bind.hpp> DECLARE_LOADER("flatview", FlatView); diff --git a/project2/basics/views/rowView.cpp b/project2/basics/views/rowView.cpp index 9727480..8ec5417 100644 --- a/project2/basics/views/rowView.cpp +++ b/project2/basics/views/rowView.cpp @@ -1,9 +1,8 @@ #include <pch.hpp> #include "rowView.h" #include "presenter.h" -#include "scopeObject.h" #include "scriptLoader.h" -#include "scopeObject.h" +#include <scopeExit.h> #include <boost/bind.hpp> DECLARE_LOADER("view", RowView); @@ -73,10 +72,10 @@ RowView::execute(const MultiRowSetPresenter * p, ExecContext * ec) const p->addNewRowSet(rootName(ec)); } bool rowsFound = false; - ScopeObject pres(rootName(ec).isNull() ? ScopeObject::Event() : boost::bind(&MultiRowSetPresenter::finishRowSet, p)); + AdHoc::ScopeExit pres(rootName(ec).isNull() ? AdHoc::ScopeExit::Event() : boost::bind(&MultiRowSetPresenter::finishRowSet, p)); { p->addNewArray(recordName(ec), true); - ScopeObject pres(boost::bind(&MultiRowSetPresenter::finishArray, p, true)); + AdHoc::ScopeExit pres(boost::bind(&MultiRowSetPresenter::finishArray, p, true)); RowProcessor::execute(ec, boost::bind(&RowView::rowReady, this, _1, p, ec, boost::ref(rowsFound))); } if (required(ec) && !rowsFound) { @@ -85,7 +84,7 @@ RowView::execute(const MultiRowSetPresenter * p, ExecContext * ec) const for (SetAggregateCPtr s : setAggregates) { p->addNewArray(s->name, false); - ScopeObject pres(boost::bind(&MultiRowSetPresenter::finishArray, p, false)); + AdHoc::ScopeExit pres(boost::bind(&MultiRowSetPresenter::finishArray, p, false)); s->onResultValues(boost::bind(&MultiRowSetPresenter::addNamedValue, p, "value", _1)); s->reset(); } diff --git a/project2/basics/views/singleton.cpp b/project2/basics/views/singleton.cpp index c67fb12..29b32aa 100644 --- a/project2/basics/views/singleton.cpp +++ b/project2/basics/views/singleton.cpp @@ -2,7 +2,7 @@ #include "view.h" #include "iHaveParameters.h" #include "presenter.h" -#include "scopeObject.h" +#include <scopeExit.h> class Singleton : public View { public: @@ -19,7 +19,7 @@ class Singleton : public View { void execute(const MultiRowSetPresenter * p, ExecContext * ec) const { p->addNewRowSet(rootName(ec)); - ScopeObject pres(boost::bind(&MultiRowSetPresenter::finishRowSet, p)); + AdHoc::ScopeExit pres(boost::bind(&MultiRowSetPresenter::finishRowSet, p)); for (const Columns::value_type & col : viewColumns) { p->addNamedValue(col.first, col.second(ec)); } |