summaryrefslogtreecommitdiffstats
path: root/src/lib/netlist/plib/putil.h
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-07-21 11:05:55 +0200
committer couriersud <couriersud@arcor.de>2016-07-21 11:05:55 +0200
commit1e40d95e8b47d834d1ede706921dc19850aaaff2 (patch)
treef2e74d4451a527313fdc52f49b10955153f1dbd5 /src/lib/netlist/plib/putil.h
parent7a69d48edd6e1f59c92271eb7fa217eaf0a714c7 (diff)
Netlist updates:
- Removed trampolines (OUTLOGIC, INPLOGIC and friends). - Started using doxygen comment and documentation style. Added doxygen files to documentation folder. - Refactored code triggered by doxygen output. - Moved internal and support classes into namespace detail. - Use an anordered map in parser. - -Wconversion fixes - All done now. - Fixed -Wold-style-cast warnings in netlist code. - Added iterators to pstring. - Moved two macros, added more RAII and improved exceptions. Fixed some bugs in parser code. - Fixed a number of bugs in parser code and exception handling. [Couriersud]
Diffstat (limited to 'src/lib/netlist/plib/putil.h')
-rw-r--r--src/lib/netlist/plib/putil.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index 39d10bcadb5..cc388cd3393 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -29,19 +29,20 @@ namespace plib
return std::find(con.begin(), con.end(), elem) != con.end();
}
+ static constexpr const std::size_t npos = static_cast<std::size_t>(-1);
template <class C>
- int indexof(C &con, const typename C::value_type &elem)
+ std::size_t indexof(C &con, const typename C::value_type &elem)
{
auto it = std::find(con.begin(), con.end(), elem);
if (it != con.end())
- return it - con.begin();
- return -1;
+ return static_cast<std::size_t>(it - con.begin());
+ return npos;
}
template <class C>
void insert_at(C &con, const std::size_t index, const typename C::value_type &elem)
{
- con.insert(con.begin() + index, elem);
+ con.insert(con.begin() + static_cast<std::ptrdiff_t>(index), elem);
}
}