From fc669d12e036454a27ea9ab563b4411e21ebf0b6 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Aug 2004 09:44:25 +0200 Subject: [PATCH] 18 bits didn't fit into Uint16 --- ndb/include/kernel/signaldata/TcKeyReq.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ndb/include/kernel/signaldata/TcKeyReq.hpp b/ndb/include/kernel/signaldata/TcKeyReq.hpp index ba0f1a5ed8c..9e42f2a70d5 100644 --- a/ndb/include/kernel/signaldata/TcKeyReq.hpp +++ b/ndb/include/kernel/signaldata/TcKeyReq.hpp @@ -143,7 +143,7 @@ private: */ static Uint8 getTakeOverScanFlag(const UintR & scanInfo); static Uint16 getTakeOverScanNode(const UintR & scanInfo); - static Uint16 getTakeOverScanInfo(const UintR & scanInfo); + static Uint32 getTakeOverScanInfo(const UintR & scanInfo); /** @@ -172,7 +172,7 @@ private: */ static void setTakeOverScanFlag(UintR & scanInfo, Uint8 flag); static void setTakeOverScanNode(UintR & scanInfo, Uint16 node); - static void setTakeOverScanInfo(UintR & scanInfo, Uint16 aScanInfo); + static void setTakeOverScanInfo(UintR & scanInfo, Uint32 aScanInfo); }; /** @@ -490,9 +490,9 @@ TcKeyReq::getTakeOverScanNode(const UintR & scanInfo){ } inline -Uint16 +Uint32 TcKeyReq::getTakeOverScanInfo(const UintR & scanInfo){ - return (Uint16)((scanInfo >> SCAN_INFO_SHIFT) & SCAN_INFO_MASK); + return (Uint32)((scanInfo >> SCAN_INFO_SHIFT) & SCAN_INFO_MASK); } @@ -512,7 +512,7 @@ TcKeyReq::setTakeOverScanNode(UintR & scanInfo, Uint16 node){ inline void -TcKeyReq::setTakeOverScanInfo(UintR & scanInfo, Uint16 aScanInfo){ +TcKeyReq::setTakeOverScanInfo(UintR & scanInfo, Uint32 aScanInfo){ // ASSERT_MAX(aScanInfo, SCAN_INFO_MASK, "TcKeyReq::setTakeOverScanInfo"); scanInfo |= (aScanInfo << SCAN_INFO_SHIFT); }