diff --git a/src/ca/caServerID.h b/src/ca/caServerID.h index 45b4e250e..fe6f6968d 100644 --- a/src/ca/caServerID.h +++ b/src/ca/caServerID.h @@ -1,5 +1,5 @@ - -/* $Id$ +/* + * $Id$ * * L O S A L A M O S * Los Alamos National Laboratory @@ -19,7 +19,7 @@ class caServerID { public: - caServerID ( const struct sockaddr_in & addrIn, unsigned char priority ); + caServerID ( const struct sockaddr_in & addrIn, unsigned priority ); bool operator == ( const caServerID & ) const; resTableIndex hash () const; static unsigned maxIndexBitWidth (); @@ -38,8 +38,8 @@ static const unsigned caServerMinIndexBitWidth = 2u; static const unsigned caServerMaxIndexBitWidth = 32u; inline caServerID::caServerID ( - const struct sockaddr_in & addrIn, unsigned char priorityIn ) : - addr ( addrIn ), pri ( priorityIn ) + const struct sockaddr_in & addrIn, unsigned priorityIn ) : + addr ( addrIn ), pri ( static_cast ( priorityIn ) ) { assert ( priorityIn <= 0xff ); } diff --git a/src/ca/cacIO.h b/src/ca/cacIO.h index 9e743e3f9..6238b6ebe 100644 --- a/src/ca/cacIO.h +++ b/src/ca/cacIO.h @@ -1,4 +1,3 @@ - /* * $Id$ * @@ -124,7 +123,7 @@ public: // class epicsShareClass cacChannel { public: - typedef unsigned char priLev; + typedef unsigned priLev; static const priLev priorityMax; static const priLev priorityMin; static const priLev priorityDefault; diff --git a/src/ca/cadef.h b/src/ca/cadef.h index 4a174d29c..41ed6dd7b 100644 --- a/src/ca/cadef.h +++ b/src/ca/cadef.h @@ -242,7 +242,7 @@ epicsShareFunc int epicsShareAPI ca_search_and_connect /* End of anachronistic entry points */ /************************************************************************/ -typedef unsigned char capri; +typedef unsigned capri; #define CA_PRIORITY_MAX 99 #define CA_PRIORITY_MIN 0 #define CA_PRIORITY_DEFAULT CA_PRIORITY_MIN diff --git a/src/ca/nciu.cpp b/src/ca/nciu.cpp index a5729068e..9410032fa 100644 --- a/src/ca/nciu.cpp +++ b/src/ca/nciu.cpp @@ -1,5 +1,5 @@ - -/* $Id$ +/* + * $Id$ * * L O S A L A M O S * Los Alamos National Laboratory @@ -58,7 +58,7 @@ nciu::nciu ( cac & cacIn, netiiu & iiuIn, cacChannelNotify & chanIn, retrySeqNo ( 0u ), nameLength ( static_cast ( strlen ( pNameIn ) + 1 ) ), typeCode ( USHRT_MAX ), - priority ( pri ), + priority ( static_cast ( pri ) ), f_connected ( false ), f_previousConn ( false ), f_claimSent ( false ),