Changeset 99:6a0a5f236ed5 in finroc_plugins_data_ports


Ignore:
Timestamp:
22.05.2015 20:08:38 (4 years ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
default
Phase:
public
Message:

Adapted to changes in rrlib_rtti

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • api/tGenericPortImplementation.cpp

    r69 r99  
    286286      internal::CheckCreateImplementationForType<int16_t>(type); 
    287287      internal::CheckCreateImplementationForType<int>(type); 
    288       internal::CheckCreateImplementationForType<long int>(type); 
    289288      internal::CheckCreateImplementationForType<long long int>(type); 
    290289      internal::CheckCreateImplementationForType<uint8_t>(type); 
    291290      internal::CheckCreateImplementationForType<uint16_t>(type); 
    292291      internal::CheckCreateImplementationForType<unsigned int>(type); 
    293       internal::CheckCreateImplementationForType<unsigned long int>(type); 
    294292      internal::CheckCreateImplementationForType<unsigned long long int>(type); 
    295293      internal::CheckCreateImplementationForType<double>(type); 
  • optimized/tSingleThreadedCheapCopyPortGeneric.h

    r80 r99  
    110110    T Value() 
    111111    { 
    112       assert(typeid(T).name() == value->data->GetType().GetRttiName()); 
     112      assert(typeid(typename rrlib::rtti::NormalizedType<T>::type).name() == value->data->GetType().GetRttiName()); 
    113113      return *static_cast<T*>(value->data_pointer); 
    114114    } 
  • tPort.h

    r69 r99  
    332332  static tPort Wrap(core::tAbstractPort& wrap) 
    333333  { 
    334     if (wrap.GetDataType().GetRttiName() != typeid(tPortBuffer).name()) 
     334    if (wrap.GetDataType().GetRttiName() != typeid(typename rrlib::rtti::NormalizedType<tPortBuffer>::type).name()) 
    335335    { 
    336336      //FINROC_LOG_PRINT(ERROR, "tPort<", rrlib::rtti::Demangle(typeid(T).name()), "> cannot wrap port with buffer type '", wrap.GetDataType().GetName(), "'."); 
Note: See TracChangeset for help on using the changeset viewer.