From cc64921ab89f106b899c81f02dd7f985a0d6b0cc Mon Sep 17 00:00:00 2001 From: gdd Date: Thu, 7 Jun 2012 11:53:26 +0000 Subject: [PATCH] Another fix for compilation with gcc 4.7 --- src/DSC/DSC_User/Datastream/GenericPort.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DSC/DSC_User/Datastream/GenericPort.hxx b/src/DSC/DSC_User/Datastream/GenericPort.hxx index 01a2d29e7..d56323152 100644 --- a/src/DSC/DSC_User/Datastream/GenericPort.hxx +++ b/src/DSC/DSC_User/Datastream/GenericPort.hxx @@ -283,7 +283,7 @@ void GenericPort::put(CorbaInDataType dataPara // rem : Utilisation de l'évaluation gauche droite du logical C or if ( waitingForAnyDataId || ( waitingForConvenientDataId && - isDataIdConveniant(storedDatas, expectedDataId, dummy1, dummy2, dummy3) ) + this->isDataIdConveniant(storedDatas, expectedDataId, dummy1, dummy2, dummy3) ) ) { #ifdef MYDEBUG std::cout << "-------- Put : MARK 10 ------------------" << std::endl; @@ -394,7 +394,7 @@ GenericPort::get(TimeType time, // que la politique gére ce cas de figure // - l'itérateur wDataIt1 est tel que wDataIt1->first < wdataId < (wDataIt1+1)->first // Méthode provenant de la COUPLING_POLICY - isDataIdConveniant(storedDatas,expectedDataId,isEqual,isBounded,wDataIt1); + this->isDataIdConveniant(storedDatas,expectedDataId,isEqual,isBounded,wDataIt1); #ifdef MYDEBUG std::cout << "-------- Get : MARK 3 ------------------" << std::endl; #endif @@ -651,8 +651,8 @@ GenericPort::next(TimeType &t, std::cout << "-------- Next : MARK 6 ------------------" << std::endl; #endif - t = getTime( (*wDataIt1).first ); - tag = getTag ( (*wDataIt1).first ); + t = this->getTime( (*wDataIt1).first ); + tag = this->getTag ( (*wDataIt1).first ); dataToTransmit = (*wDataIt1).second; #ifdef MYDEBUG -- 2.39.2