CoRE Simulation Models for Real-time Networks

Changeset 0dc298c in oppResultManagers


Ignore:
Timestamp:
04/15/16 17:51:02 (3 years ago)
Author:
steinbach <till.steinbach@…>
Branches:
master
Children:
4ec1471
Parents:
4b89d1b
Message:

more namespace fixes

Location:
src/oppresultmanagers
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/oppresultmanagers/multiple/cMultipleEventlogManager.cc

    r4b89d1b r0dc298c  
    137137}
    138138
    139 void cMultipleEventlogManager::messageSendDirect(omnetpp::cMessage *msg, omnetpp::cGate *toGate, simtime_t propagationDelay,
    140         simtime_t transmissionDelay)
     139void cMultipleEventlogManager::messageSendDirect(omnetpp::cMessage *msg, omnetpp::cGate *toGate, omnetpp::simtime_t propagationDelay,
     140        omnetpp::simtime_t transmissionDelay)
    141141{
    142142    for (std::vector<omnetpp::cIEventlogManager*>::const_iterator eventlogManager = eventlogManagers.begin();
     
    156156}
    157157
    158 void cMultipleEventlogManager::messageSendHop(omnetpp::cMessage *msg, omnetpp::cGate *srcGate, simtime_t propagationDelay,
    159         simtime_t transmissionDelay)
     158void cMultipleEventlogManager::messageSendHop(omnetpp::cMessage *msg, omnetpp::cGate *srcGate, omnetpp::simtime_t propagationDelay,
     159        omnetpp::simtime_t transmissionDelay)
    160160{
    161161    for (std::vector<omnetpp::cIEventlogManager*>::const_iterator eventlogManager = eventlogManagers.begin();
  • src/oppresultmanagers/multiple/cMultipleEventlogManager.h

    r4b89d1b r0dc298c  
    8787        virtual void messageCancelled(omnetpp::cMessage *msg);
    8888        virtual void beginSend(omnetpp::cMessage *msg);
    89         virtual void messageSendDirect(omnetpp::cMessage *msg, omnetpp::cGate *toGate, simtime_t propagationDelay, simtime_t transmissionDelay);
     89        virtual void messageSendDirect(omnetpp::cMessage *msg, omnetpp::cGate *toGate, omnetpp::simtime_t propagationDelay, omnetpp::simtime_t transmissionDelay);
    9090        virtual void messageSendHop(omnetpp::cMessage *msg, omnetpp::cGate *srcGate);
    91         virtual void messageSendHop(omnetpp::cMessage *msg, omnetpp::cGate *srcGate, simtime_t propagationDelay, simtime_t transmissionDelay);
     91        virtual void messageSendHop(omnetpp::cMessage *msg, omnetpp::cGate *srcGate, omnetpp::simtime_t propagationDelay, omnetpp::simtime_t transmissionDelay);
    9292        virtual void endSend(omnetpp::cMessage *msg);
    9393        virtual void messageCreated(omnetpp::cMessage *msg);
  • src/oppresultmanagers/multiple/cMultipleOutputVectorManager.cc

    r4b89d1b r0dc298c  
    121121    }
    122122}
    123 bool cMultipleOutputVectorManager::record(void *vectorhandle, simtime_t t, double value)
     123bool cMultipleOutputVectorManager::record(void *vectorhandle, omnetpp::simtime_t t, double value)
    124124{
    125125    bool returnValue = false;
  • src/oppresultmanagers/multiple/cMultipleOutputVectorManager.h

    r4b89d1b r0dc298c  
    8585         * Writes the (time, value) pair into the output file.
    8686         */
    87         virtual bool record(void *vectorhandle, simtime_t t, double value) override;
     87        virtual bool record(void *vectorhandle, omnetpp::simtime_t t, double value) override;
    8888
    8989        /**
  • src/oppresultmanagers/utilities/HelperFunctions.cc

    r4b89d1b r0dc298c  
    3131#include <omnetpp.h>
    3232
    33 std::vector<std::pair<simtime_t, simtime_t> > parseIntervals(const char* text)
     33std::vector<std::pair<omnetpp::simtime_t, omnetpp::simtime_t> > parseIntervals(const char* text)
    3434{
    35     std::vector<std::pair<simtime_t, simtime_t>> parsedIntervals;
     35    std::vector<std::pair<omnetpp::simtime_t, omnetpp::simtime_t>> parsedIntervals;
    3636    std::vector<std::string> intervals = omnetpp::cStringTokenizer(text, ",").asVector();
    3737    for (std::vector<std::string>::const_iterator interval = intervals.begin(); interval != intervals.end(); ++interval)
    3838    {
    39         simtime_t starttime = 0;
    40         simtime_t endtime = 0;
     39        omnetpp::simtime_t starttime = 0;
     40        omnetpp::simtime_t endtime = 0;
    4141        size_t pos = (*interval).find("..");
    4242        if (pos == std::string::npos)
     
    6262            }
    6363        }
    64         parsedIntervals.push_back(std::pair<simtime_t, simtime_t>(starttime, endtime));
     64        parsedIntervals.push_back(std::pair<omnetpp::simtime_t, omnetpp::simtime_t>(starttime, endtime));
    6565    }
    6666    return parsedIntervals;
    6767}
    6868
    69 bool inIntervals(simtime_t t, std::vector<std::pair<simtime_t, simtime_t> > &intervals)
     69bool inIntervals(omnetpp::simtime_t t, std::vector<std::pair<omnetpp::simtime_t, omnetpp::simtime_t> > &intervals)
    7070{
    7171    if (intervals.size() > 0)
     
    7373        //Check intervals
    7474        bool inIntervals = false;
    75         for (std::vector<std::pair<simtime_t, simtime_t>>::iterator interval = intervals.begin();
     75        for (std::vector<std::pair<omnetpp::simtime_t, omnetpp::simtime_t>>::iterator interval = intervals.begin();
    7676                interval != intervals.end();)
    7777        {
Note: See TracChangeset for help on using the changeset viewer.