55#include < memory>
66#include < stdexcept>
77#include < string>
8- #include < vector>
98
109namespace odr ::internal::oldms {
1110
@@ -273,7 +272,7 @@ struct Sprm {
273272 std::uint16_t sgc : 3 ;
274273 std::uint16_t spra : 3 ;
275274
276- int operand_size () const {
275+ [[nodiscard]] int operand_size () const {
277276 switch (spra) {
278277 case 0 :
279278 case 1 :
@@ -351,23 +350,31 @@ template <typename Derived, typename Data> class PlcBase {
351350public:
352351 static constexpr std::uint32_t cbData () { return sizeof (Data); }
353352
354- std::uint32_t n () const { return (self ().cbPlc () - 4 ) / (4 + sizeof (Data)); }
353+ [[nodiscard]] std::uint32_t n () const {
354+ return (self ().cbPlc () - 4 ) / (4 + sizeof (Data));
355+ }
355356
356- const std::uint32_t *aCP_ptr () const {
357+ [[nodiscard]] const std::uint32_t *aCP_ptr () const {
357358 return reinterpret_cast <const std::uint32_t *>(self ().data ());
358359 }
359360
360- const Data *aData_ptr () const {
361+ [[nodiscard]] const Data *aData_ptr () const {
361362 return reinterpret_cast <const Data *>(self ().data () + (n () + 1 ) * 4 );
362363 }
363364
364- std::uint32_t aCP (const std::uint32_t i) const { return aCP_ptr ()[i]; }
365+ [[nodiscard]] std::uint32_t aCP (const std::uint32_t i) const {
366+ return aCP_ptr ()[i];
367+ }
365368
366- Data aData (const std::uint32_t i) const { return aData_ptr ()[i]; }
369+ [[nodiscard]] Data aData (const std::uint32_t i) const {
370+ return aData_ptr ()[i];
371+ }
367372
368373private:
369- Derived &self () { return *static_cast <Derived *>(this ); }
370- const Derived &self () const { return *static_cast <const Derived *>(this ); }
374+ [[nodiscard]] Derived &self () { return *static_cast <Derived *>(this ); }
375+ [[nodiscard]] const Derived &self () const {
376+ return *static_cast <const Derived *>(this );
377+ }
371378};
372379
373380template <typename Derived> class PlcPcdBase : public PlcBase <Derived, Pcd> {};
@@ -377,8 +384,8 @@ class PlcPcdMap : public PlcPcdBase<PlcPcdMap> {
377384 PlcPcdMap (char *data, const std::size_t cbPlc)
378385 : m_data(data), m_cbPlc(cbPlc) {}
379386
380- char *data () const { return m_data; }
381- std::size_t cbPlc () const { return m_cbPlc; }
387+ [[nodiscard]] char *data () const { return m_data; }
388+ [[nodiscard]] std::size_t cbPlc () const { return m_cbPlc; }
382389
383390private:
384391 char *m_data{nullptr };
0 commit comments