adding typename

sync
Volker Birk 4 years ago
parent 6ab4d2664b
commit 0fa4e1aee0

@ -140,6 +140,8 @@
<ItemGroup>
<ClInclude Include="..\Adapter.hh" />
<ClInclude Include="..\Adapter.hxx" />
<ClInclude Include="..\locked_queue.hh" />
<ClInclude Include="..\pc_container.hh" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

@ -29,5 +29,11 @@
<ClInclude Include="..\Adapter.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\locked_queue.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\pc_container.hh">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

@ -67,7 +67,6 @@ namespace utility
return r;
}
// returns true and set a copy of the last element and pop it from queue if there is any
// returns false and leaves 'out' untouched if queue is empty even after 'end_time'
bool try_pop_back(T& out, std::chrono::steady_clock::time_point end_time)
@ -82,7 +81,6 @@ namespace utility
_q.pop_back();
return true;
}
// returns true and set a copy of the first element and pop it from queue if there is any
// returns false and leaves 'out' untouched if queue is empty even after 'end_time'
@ -108,6 +106,14 @@ namespace utility
_cv.notify_one();
}
void emplace_back(const T& data)
{
{
Lock L(_mtx);
_q.emplace_back(data);
}
_cv.notify_one();
}
void push_front(const T& data)
{

@ -31,8 +31,8 @@ public:
typedef std::list<PC> Container;
Container::const_iterator begin() const noexcept { return c.cbegin(); }
Container::const_iterator end() const noexcept { return c.cend(); }
typename Container::const_iterator begin() const noexcept { return c.cbegin(); }
typename Container::const_iterator end() const noexcept { return c.cend(); }
std::size_t size() const noexcept { return c.size(); }
bool empty() const noexcept { return c.empty(); }
@ -48,15 +48,14 @@ public:
}
// Beware: does not delete *pdata nor *cdata! That's producer's and consumer's task!
void erase(Container::const_iterator pos)
void erase(typename Container::const_iterator pos)
{
// changed.push_back( *pos );
changed.emplace_back(nullptr, pos->cdata);
changed.push_back( *pos );
c.erase(pos);
}
// notify Consumer about the changed element
void change(Container::const_iterator pos)
void change(typename Container::const_iterator pos)
{
changed.push_back( *pos );
}
@ -103,8 +102,8 @@ public:
}
private:
Container c;
locked_queue<PC> changed;
typename Container c;
::utility::locked_queue< PC > changed;
};
} // end of namespace pEp

Loading…
Cancel
Save