Changeset 53:60c300f3c8ce in rrlib_serialization-java


Ignore:
Timestamp:
25.02.2020 07:39:21 (8 months ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
default
Parents:
51:4d0fc10a9592 (diff), 52:4000f69b8c8e (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
Tags:
tip
Message:

Merge with 17.03

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • rtti/DataTypeBase.java

    r50 r53  
    3131import org.rrlib.serialization.PortDataListImpl; 
    3232import org.rrlib.serialization.PublishedRegisters; 
     33import org.rrlib.serialization.PublishedRegisters.RemoteEntryBase; 
    3334import org.rrlib.serialization.Register; 
    34 import org.rrlib.serialization.PublishedRegisters.RemoteEntryBase; 
    3535 
    3636 
     
    6767    CLASSIFICATION_ENUM_BASED_FLAGS = 4 << 12, 
    6868    CLASSIFICATION_AUTO_NAMED = CLASSIFICATION_ENUM_BASED_FLAGS, 
     69    CLASSIFICATION_PORT_COMPOSITE_INTERFACE = 11 << 12, 
    6970    CLASSIFICATION_INTEGRAL = 12 << 12, 
    7071    CLASSIFICATION_OTHER_DATA_TYPE = 13 << 12, 
  • rtti/DataTypeBase.java

    r52 r53  
    408408     * @param stream Stream to serialize this type to 
    409409     */ 
    410     public void serialize(BinaryOutputStream stream) { 
     410    public void serialize(BinaryOutputStream stream) throws Exception { 
    411411        if (types.writeEntry(stream, getUid())) { 
    412412            stream.writeString(getName()); 
Note: See TracChangeset for help on using the changeset viewer.