diff --git a/LCS/AMC/AMCBase/src/DH_Request.cc b/LCS/AMC/AMCBase/src/DH_Request.cc index 459dc006c5904ba14a1d876131c78ae245773b78..288006eb727f1c48cec012a4da3dd0ba7148e200 100644 --- a/LCS/AMC/AMCBase/src/DH_Request.cc +++ b/LCS/AMC/AMCBase/src/DH_Request.cc @@ -60,8 +60,8 @@ namespace LOFAR } - void DH_Request::writeBuf(const ConverterCommand& cmd, - const RequestData& req) + void DH_Request::writeBuf(const ConverterCommand& command, + const RequestData& request) { // Create the output blob that will hold the request data to be sent to // the converter server. @@ -71,13 +71,13 @@ namespace LOFAR // \note We don't need to call putStart() and putEnd() on the blob // stream; this is done by the DataBlobExtra class in the Transport // library. - bos << cmd - << req; + bos << command + << request; } - void DH_Request::readBuf(ConverterCommand& cmd, - RequestData& req) + void DH_Request::readBuf(ConverterCommand& command, + RequestData& request) { // Open the input blob to read the data that were just received from the // converter client. @@ -89,8 +89,8 @@ namespace LOFAR ASSERT(found && version == theirVersionNr); // Retrieve the converter request. - bis >> cmd - >> req; + bis >> command + >> request; // Assert that we're really at the end of the blob. bis.getEnd(); diff --git a/LCS/AMC/AMCBase/src/DH_Result.cc b/LCS/AMC/AMCBase/src/DH_Result.cc index abf4fafc93c16b1c4b34883bed861e3651fa08aa..d02bdd15cf2a677c63dcd8eab1e385093b09b48e 100644 --- a/LCS/AMC/AMCBase/src/DH_Result.cc +++ b/LCS/AMC/AMCBase/src/DH_Result.cc @@ -59,8 +59,8 @@ namespace LOFAR } - void DH_Result::writeBuf(const ConverterStatus& sts, - const ResultData& res) + void DH_Result::writeBuf(const ConverterStatus& status, + const ResultData& result) { // Create the output blob that will hold the result data to be sent to // the converter client. @@ -70,12 +70,12 @@ namespace LOFAR // \note We don't need to call putStart() and putEnd() on the blob // stream; this is done by the DataBlobExtra class in the Transport // library. - bos << sts - << res; + bos << status + << result; } - void DH_Result::readBuf(ConverterStatus& sts, ResultData& res) + void DH_Result::readBuf(ConverterStatus& status, ResultData& result) { // Open the input blob to read the data that were just received from the // converter server. @@ -87,7 +87,7 @@ namespace LOFAR ASSERT(found && version == theirVersionNr); // Retrieve the converter result. - bis >> sts >> res; + bis >> status >> result; // Assert that we're really at the end of the blob. bis.getEnd();