Skip to content

Commit

Permalink
Fixed: deprecated std::interator (C++17).
Browse files Browse the repository at this point in the history
  • Loading branch information
AnarManafov committed Mar 29, 2022
1 parent 0654598 commit 8c6c950
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ set( WN_PKG_DIR "${CMAKE_BINARY_DIR}/dds-wrk-bin" )
set( WN_PKG_NAME_ARCH "${WN_PKG_NAME}.tar.gz" )
set( WN_PKG_REMOTE_DIR "/u/ddswww/web-docs/releases/add/${DDS_VERSION}" )

set(DDS_BOOST_LIB_DIR ${Boost_LIBRARY_DIR})
set(DDS_BOOST_LIB_DIR ${Boost_LIBRARY_DIRS})
if("${DDS_BOOST_LIB_DIR}" STREQUAL "")
set(DDS_BOOST_LIB_DIR ${Boost_LIBRARY_DIR_RELEASE})
endif()
Expand Down
1 change: 1 addition & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### DDS common
Added: every DDS module logs now its pid, group id and parent pid. (GH-403)
Fixed: On task done remove agents from the agent to tasks mapping.
Fixed: Replace std::iterator as it's deprecated (C++17).

### dds-session
Fixed: skip bad or non-session directories/files when performing clean and list operations.
Expand Down
1 change: 1 addition & 0 deletions dds-commander/src/ConnectionManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1221,6 +1221,7 @@ void CConnectionManager::updateTopology(const dds::tools_api::STopologyRequestDa
weakChannelInfo_t::container_t agents;
for (auto taskID : removedTasks)
{
lock_guard<mutex> lock(m_mapMutex);
auto agentChannel = m_taskIDToAgentChannelMap[taskID];
agents.push_back(agentChannel);
}
Expand Down
7 changes: 6 additions & 1 deletion dds-misc-lib/src/CustomIterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,14 @@ namespace dds::misc
*
*/
template <class T, class Ch = char, class Tr = std::char_traits<Ch>, class Dist = std::ptrdiff_t>
class custom_istream_iterator : public std::iterator<std::input_iterator_tag, T, Dist, const T*, const T&>
class custom_istream_iterator
{
public:
using iterator_category = std::input_iterator_tag;
using value_type = T;
using difference_type = Dist;
using pointer = T*;
using reference = T&;
typedef custom_istream_iterator<T, Ch, Tr, Dist> m_it;
typedef Ch char_type;
typedef Tr traits_type;
Expand Down

0 comments on commit 8c6c950

Please sign in to comment.