diff --git a/src/ca/CASG.cpp b/src/ca/CASG.cpp index f115e07a6..6a5a777e5 100644 --- a/src/ca/CASG.cpp +++ b/src/ca/CASG.cpp @@ -165,7 +165,7 @@ void CASG::reset () void CASG::show ( unsigned level) const { - printf ("Sync Group: id=%u, magic=%lu, opPend=%lu, seqNo=%lu\n", + printf ("Sync Group: id=%u, magic=%u, opPend=%lu, seqNo=%lu\n", this->getId (), this->magic, this->opPendCount, this->seqNo); if ( level ) { diff --git a/src/ca/bhe_IL.h b/src/ca/bhe_IL.h index 72b1898df..96805a473 100644 --- a/src/ca/bhe_IL.h +++ b/src/ca/bhe_IL.h @@ -26,7 +26,7 @@ * between the 1st and 2nd beacons) */ inline bhe::bhe (class cac &cacIn, const osiTime &initialTimeStamp, const inetAddrID &addr) : - cac (cacIn), inetAddrID (addr), piiu (0), timeStamp (initialTimeStamp), averagePeriod (-1.0) + inetAddrID (addr), cac (cacIn), piiu (0), timeStamp (initialTimeStamp), averagePeriod (-1.0) { # ifdef DEBUG { diff --git a/src/ca/netReadNotifyIO.cpp b/src/ca/netReadNotifyIO.cpp index a954b60ee..079324287 100644 --- a/src/ca/netReadNotifyIO.cpp +++ b/src/ca/netReadNotifyIO.cpp @@ -15,7 +15,7 @@ tsFreeList < class netReadNotifyIO, 1024 > netReadNotifyIO::freeList; netReadNotifyIO::netReadNotifyIO ( nciu &chan, cacNotify ¬ifyIn ) : - baseNMIU ( chan ), cacNotifyIO ( notifyIn ) + cacNotifyIO ( notifyIn ), baseNMIU ( chan ) { } diff --git a/src/ca/netSubscription.cpp b/src/ca/netSubscription.cpp index 8bad1fe78..38a4d8cf6 100644 --- a/src/ca/netSubscription.cpp +++ b/src/ca/netSubscription.cpp @@ -16,8 +16,8 @@ tsFreeList < class netSubscription, 1024 > netSubscription::freeList; netSubscription::netSubscription ( nciu &chan, chtype typeIn, unsigned long countIn, unsigned short maskIn, cacNotify ¬ifyIn ) : - baseNMIU (chan), cacNotifyIO (notifyIn), - mask (maskIn), type (typeIn), count (countIn) + cacNotifyIO (notifyIn), baseNMIU (chan), + type (typeIn), count (countIn), mask (maskIn) { } diff --git a/src/ca/netWriteNotifyIO.cpp b/src/ca/netWriteNotifyIO.cpp index af3535295..463f65de6 100644 --- a/src/ca/netWriteNotifyIO.cpp +++ b/src/ca/netWriteNotifyIO.cpp @@ -15,7 +15,7 @@ tsFreeList < class netWriteNotifyIO, 1024 > netWriteNotifyIO::freeList; netWriteNotifyIO::netWriteNotifyIO (nciu &chan, cacNotify ¬ifyIn) : - baseNMIU (chan), cacNotifyIO (notifyIn) + cacNotifyIO (notifyIn), baseNMIU (chan) { }