Changeset 185:0f6aa7c893a8 in rrlib_serialization


Ignore:
Timestamp:
20.03.2019 22:15:02 (3 months ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
17.03
Children:
186:2d83d4e1fdcf, 187:108677185b5f
Phase:
public
Message:

Removes clang compiler warning

File:
1 edited

Legend:

Unmodified
Added
Removed
  • PublishedRegisters.hpp

    r163 r185  
    9999  static_assert(std::is_same<typename TRemoteEntry::tHandle, tHandle>::value, "Handle types must match"); 
    100100 
    101   class tRemoteRegisterInstance : public tRemoteRegister<TRemoteEntry> 
    102   { 
    103     typedef tRemoteRegister<TRemoteEntry> tBase; 
     101  typedef tRemoteRegister<TRemoteEntry> tRegisterBase; 
     102 
     103  class tRemoteRegisterInstance : public tRegisterBase 
     104  { 
    104105 
    105106  public: 
    106107    tRemoteRegisterInstance() 
    107108    { 
    108       tRemoteRegisterBase::size = &tBase::SizeAtomic(); 
     109      tRemoteRegisterBase::size = &tRegisterBase::SizeAtomic(); 
    109110    } 
    110111 
     
    115116      if (stream.GetSourceInfo().revision == 0) 
    116117      { 
    117         if (tBase::Size() == 0) 
     118        if (tRegisterBase::Size() == 0) 
    118119        { 
    119120          stream.ReadShort(); 
     
    125126        { 
    126127          t.DeserializeRegisterEntry(stream); 
    127           tBase::SetHandle(t, tBase::Size()); 
    128           tBase::Add(t); 
     128          tRegisterBase::SetHandle(t, tRegisterBase::Size()); 
     129          tRegisterBase::Add(t); 
    129130          s = stream.ReadShort(); 
    130131        } 
     
    135136        for (size_t i = 0; i < count; i++) 
    136137        { 
    137           tBase::SetHandle(t, tBase::Size()); 
     138          tRegisterBase::SetHandle(t, tRegisterBase::Size()); 
    138139          t.DeserializeRegisterEntry(stream); 
    139           tBase::Add(t); 
     140          tRegisterBase::Add(t); 
    140141        } 
    141142      } 
Note: See TracChangeset for help on using the changeset viewer.