Skip to content

Commit

Permalink
fixing warnings #3
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed Mar 12, 2024
1 parent 32becf4 commit 3e6dd0a
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
50 changes: 25 additions & 25 deletions src/microsim/MSRouteHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class MSRouteHandler : public SUMORouteHandler, public MapMatcher<MSEdge, MSLane
* @see GenericSAXHandler::myStartElement
*/
virtual void myStartElement(int element,
const SUMOSAXAttributes& attrs);
const SUMOSAXAttributes& attrs) override;
//@}

/** @brief Called for parsing from and to and the corresponding taz attributes
Expand All @@ -95,84 +95,84 @@ class MSRouteHandler : public SUMORouteHandler, public MapMatcher<MSEdge, MSLane
void parseFromViaTo(SumoXMLTag tag, const SUMOSAXAttributes& attrs);

/// @brief opens a type distribution for reading
void openVehicleTypeDistribution(const SUMOSAXAttributes& attrs);
void openVehicleTypeDistribution(const SUMOSAXAttributes& attrs) override;

/// @brief closes (ends) the building of a distribution
void closeVehicleTypeDistribution();
void closeVehicleTypeDistribution() override;

/// @brief opens a route for reading
void openRoute(const SUMOSAXAttributes& attrs);
void openRoute(const SUMOSAXAttributes& attrs) override;

/// @brief opens a flow for reading
void openFlow(const SUMOSAXAttributes& attrs);
void openFlow(const SUMOSAXAttributes& attrs) override;

/// @brief opens a route flow for reading
void openRouteFlow(const SUMOSAXAttributes& attrs);
void openRouteFlow(const SUMOSAXAttributes& attrs) override;

/// @brief opens a trip for reading
void openTrip(const SUMOSAXAttributes& attrs);
void openTrip(const SUMOSAXAttributes& attrs) override;

/**@brief closes (ends) the building of a route.
* @note Afterwards no edges may be added to it;
* this method may throw exceptions when
* a) the route is empty or
* b) another route with the same id already exists
*/
void closeRoute(const bool mayBeDisconnected = false);
void closeRoute(const bool mayBeDisconnected = false) override;

/// @brief opens a route distribution for reading
void openRouteDistribution(const SUMOSAXAttributes& attrs);
void openRouteDistribution(const SUMOSAXAttributes& attrs) override;

/// @brief closes (ends) the building of a distribution
void closeRouteDistribution();
void closeRouteDistribution() override;

/// @brief Ends the processing of a vehicle (note: is virtual because is reimplemented in MSStateHandler)
virtual void closeVehicle();
virtual void closeVehicle() override;

/// @brief Ends the processing of a vehicle type
void closeVType();
void closeVType() override;

/// @brief Ends the processing of a person
void closePerson();
void closePerson() override;

/// @brief Ends the processing of a personFlow
void closePersonFlow();
void closePersonFlow() override;

/// @brief Ends the processing of a container
void closeContainer();
void closeContainer() override;

/// @brief Ends the processing of a containerFlow
void closeContainerFlow();
void closeContainerFlow() override;

/// @brief Ends the processing of a flow
void closeFlow();
void closeFlow() override;

/// @brief Ends the processing of a trip
void closeTrip();
void closeTrip() override;

/// @brief Parse destination stop
MSStoppingPlace* retrieveStoppingPlace(const SUMOSAXAttributes& attrs, const std::string& errorSuffix, SUMOVehicleParameter::Stop* stopParam = nullptr);

/// @brief Processing of a stop
Parameterised* addStop(const SUMOSAXAttributes& attrs);
Parameterised* addStop(const SUMOSAXAttributes& attrs) override;

/// @brief add a routing request for a walking or intermodal person
void addPersonTrip(const SUMOSAXAttributes& attrs);
void addPersonTrip(const SUMOSAXAttributes& attrs) override;

/// @brief add a fully specified walk
void addWalk(const SUMOSAXAttributes& attrs);
void addWalk(const SUMOSAXAttributes& attrs) override;

/// @brief Processing of a person
void addTransportable(const SUMOSAXAttributes& attrs, const bool isPerson);
void addTransportable(const SUMOSAXAttributes& attrs, const bool isPerson) override;

/// @brief Processing of a ride
void addRide(const SUMOSAXAttributes& attrs);
void addRide(const SUMOSAXAttributes& attrs) override;

/// @brief Processing of a tranship
void addTranship(const SUMOSAXAttributes& attrs);
void addTranship(const SUMOSAXAttributes& attrs) override;

/// @brief Processing of a transport
void addTransport(const SUMOSAXAttributes& attrs);
void addTransport(const SUMOSAXAttributes& attrs) override;

///@ brief parse depart- and arrival positions of a walk
void parseWalkPositions(const SUMOSAXAttributes& attrs, const std::string& personID,
Expand Down
4 changes: 2 additions & 2 deletions src/utils/iodevices/OutputDevice_File.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class OutputDevice_File : public OutputDevice {
/** @brief returns the information whether the device will discard all output
* @return Whether the device redirects to /dev/null
*/
bool isNull() {
bool isNull() override {
return myAmNull;
}

Expand All @@ -64,7 +64,7 @@ class OutputDevice_File : public OutputDevice {
/** @brief Returns the associated ostream
* @return The used stream
*/
std::ostream& getOStream();
std::ostream& getOStream() override;
/// @}


Expand Down

0 comments on commit 3e6dd0a

Please sign in to comment.