Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 25, 2015, 5:37:15 PM (9 years ago)
Author:
landauf
Message:

callStaticNetworkFunction() and callMemberNetworkFunction() are now template functions instead of macros.
simplified function call interface: always pass five MultiType-references. Check if MultiType.null() evaluates to true to see if the argument was defined.
moved references to NetworkFunctionManager to NetworkFunctionIncludes.cc.
this also fixed a linker error in MSVC by including NetworkFunctionIncludes.h in a build-unit inside the network library.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/core7/src/libraries/network/FunctionCallManager.cc

    r10473 r10478  
    4040
    4141
    42 void FunctionCallManager::addCall(uint32_t functionID, uint32_t objectID, uint32_t peerID)
    43 {
    44   if(sPeerMap_.find(peerID)==sPeerMap_.end())
    45   {
    46     FunctionCallManager::sPeerMap_[peerID] = new packet::FunctionCalls;
    47     FunctionCallManager::sPeerMap_[peerID]->setPeerID(peerID);
    48   }
    49   FunctionCallManager::sPeerMap_[peerID]->addCall(functionID, objectID);
    50 }
    51 void FunctionCallManager::addCall(uint32_t functionID, uint32_t objectID, uint32_t peerID, const MultiType& mt1)
    52 {
    53   if(sPeerMap_.find(peerID)==sPeerMap_.end())
    54   {
    55     FunctionCallManager::sPeerMap_[peerID] = new packet::FunctionCalls;
    56     FunctionCallManager::sPeerMap_[peerID]->setPeerID(peerID);
    57   }
    58   FunctionCallManager::sPeerMap_[peerID]->addCall(functionID, objectID, &mt1);
    59 }
    60 void FunctionCallManager::addCall(uint32_t functionID, uint32_t objectID, uint32_t peerID, const MultiType& mt1, const MultiType& mt2)
    61 {
    62   if(sPeerMap_.find(peerID)==sPeerMap_.end())
    63   {
    64     FunctionCallManager::sPeerMap_[peerID] = new packet::FunctionCalls;
    65     FunctionCallManager::sPeerMap_[peerID]->setPeerID(peerID);
    66   }
    67   FunctionCallManager::sPeerMap_[peerID]->addCall(functionID, objectID, &mt1, &mt2);
    68 }
    69 void FunctionCallManager::addCall(uint32_t functionID, uint32_t objectID, uint32_t peerID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
    70 {
    71   if(sPeerMap_.find(peerID)==sPeerMap_.end())
    72   {
    73     FunctionCallManager::sPeerMap_[peerID] = new packet::FunctionCalls;
    74     FunctionCallManager::sPeerMap_[peerID]->setPeerID(peerID);
    75   }
    76   FunctionCallManager::sPeerMap_[peerID]->addCall(functionID, objectID, &mt1, &mt2, &mt3);
    77 }
    78 void FunctionCallManager::addCall(uint32_t functionID, uint32_t objectID, uint32_t peerID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
    79 {
    80   if(sPeerMap_.find(peerID)==sPeerMap_.end())
    81   {
    82     FunctionCallManager::sPeerMap_[peerID] = new packet::FunctionCalls;
    83     FunctionCallManager::sPeerMap_[peerID]->setPeerID(peerID);
    84   }
    85   FunctionCallManager::sPeerMap_[peerID]->addCall(functionID, objectID, &mt1, &mt2, &mt3, &mt4);
    86 }
    8742void FunctionCallManager::addCall(uint32_t functionID, uint32_t objectID, uint32_t peerID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
    8843{
    … …  
    9247    FunctionCallManager::sPeerMap_[peerID]->setPeerID(peerID);
    9348  }
    94   FunctionCallManager::sPeerMap_[peerID]->addCall(functionID, objectID, &mt1, &mt2, &mt3, &mt4, &mt5);
     49  FunctionCallManager::sPeerMap_[peerID]->addCall(functionID, objectID, mt1, mt2, mt3, mt4, mt5);
    9550}
    9651
Note: See TracChangeset for help on using the changeset viewer.