Changeset 50:980555d97ea7 in finroc_plugins_data_ports


Ignore:
Timestamp:
18.11.2013 10:48:58 (6 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Parents:
47:22c6aeb56ce0 (diff), 49:718cc4437521 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merged with 13.10

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • type_traits.h

    r47 r50  
    7878struct tIsCheaplyCopiedType 
    7979{ 
    80   enum { value = std::has_trivial_destructor<T>::value && (sizeof(T) <= 256) }; 
     80  enum { value = std::is_trivially_destructible<T>::value && (sizeof(T) <= 256) }; 
    8181}; 
    8282 
  • type_traits.h

    r49 r50  
    7878struct tIsCheaplyCopiedType 
    7979{ 
    80 #if __GNUC__ == 4 && __GNUC_MINOR__ >= 8 
    8180  enum { value = std::is_trivially_destructible<T>::value && (sizeof(T) <= 256) }; 
    82 #else 
    83   enum { value = std::has_trivial_destructor<T>::value && (sizeof(T) <= 256) }; 
    84 #endif 
    8581}; 
    8682 
Note: See TracChangeset for help on using the changeset viewer.