Skip to content

Commit

Permalink
Fixing model override warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@axelstudios
axelstudios committed Aug 27, 2015
1 parent 75c4921 commit 4dd0a22
Show file tree
Hide file tree
Showing 61 changed files with 198 additions and 198 deletions.
10 changes: 5 additions & 5 deletions openstudiocore/src/model/AirTerminalDualDuctVAV_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const;
virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const override;

//@}
/** @name Getters */
Expand Down Expand Up @@ -112,9 +112,9 @@ namespace detail {

boost::optional<Node> coldAirInletNode() const;

bool addToNode(Node & node);
bool addToNode(Node & node) override;

std::vector<IdfObject> remove();
std::vector<IdfObject> remove() override;

virtual ModelObject clone(Model model) const override;

Expand Down
4 changes: 2 additions & 2 deletions openstudiocore/src/model/AvailabilityManagerDifferentialThermostat_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

//@}
/** @name Getters */
Expand Down
6 changes: 3 additions & 3 deletions openstudiocore/src/model/AvailabilityManagerHybridVentilation_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const;
virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const override;

//@}
/** @name Getters */
Expand Down
6 changes: 3 additions & 3 deletions openstudiocore/src/model/AvailabilityManagerNightVentilation_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const;
virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const override;

//@}
/** @name Getters */
Expand Down
6 changes: 3 additions & 3 deletions openstudiocore/src/model/AvailabilityManagerOptimumStart_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const;
virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const override;

//@}
/** @name Getters */
Expand Down
16 changes: 8 additions & 8 deletions openstudiocore/src/model/ChillerAbsorptionIndirect_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

//@}
/** @name Getters */
Expand Down Expand Up @@ -186,13 +186,13 @@ namespace detail {
/** @name Other */
//@{

unsigned supplyInletPort();
unsigned supplyOutletPort();
unsigned demandInletPort();
unsigned demandOutletPort();
unsigned supplyInletPort() override;
unsigned supplyOutletPort() override;
unsigned demandInletPort() override;
unsigned demandOutletPort() override;

std::vector<ModelObject> children() const;
ModelObject clone(Model model) const;
std::vector<ModelObject> children() const override;
ModelObject clone(Model model) const override;

//@}
protected:
Expand Down
12 changes: 6 additions & 6 deletions openstudiocore/src/model/ChillerAbsorption_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

//@}
/** @name Getters */
Expand Down Expand Up @@ -168,10 +168,10 @@ namespace detail {
/** @name Other */
//@{

unsigned supplyInletPort();
unsigned supplyOutletPort();
unsigned demandInletPort();
unsigned demandOutletPort();
unsigned supplyInletPort() override;
unsigned supplyOutletPort() override;
unsigned demandInletPort() override;
unsigned demandOutletPort() override;

//@}
protected:
Expand Down
18 changes: 9 additions & 9 deletions openstudiocore/src/model/CoilCoolingDXTwoStageWithHumidityControlMode_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const;
virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const override;

//@}
/** @name Getters */
Expand Down Expand Up @@ -134,13 +134,13 @@ namespace detail {
/** @name Other */
//@{

unsigned inletPort();
unsigned outletPort();
unsigned inletPort() override;
unsigned outletPort() override;

ModelObject clone(Model model) const;
std::vector<ModelObject> children() const;
boost::optional<HVACComponent> containingHVACComponent() const;
bool addToNode(Node & node);
ModelObject clone(Model model) const override;
std::vector<ModelObject> children() const override;
boost::optional<HVACComponent> containingHVACComponent() const override;
bool addToNode(Node & node) override;

//@}
protected:
Expand Down
4 changes: 2 additions & 2 deletions openstudiocore/src/model/CoilCoolingDXVariableSpeedSpeedData_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual ModelObject clone(Model model) const override;

Expand Down
6 changes: 3 additions & 3 deletions openstudiocore/src/model/CoilCoolingDXVariableSpeed_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const;
virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const override;

virtual unsigned inletPort() override;

Expand Down
4 changes: 2 additions & 2 deletions ...diocore/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual ModelObject clone(Model model) const override;

Expand Down
4 changes: 2 additions & 2 deletions openstudiocore/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual unsigned airInletPort() override;

Expand Down
4 changes: 2 additions & 2 deletions openstudiocore/src/model/CoilHeatingDXMultiSpeedStageData_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual ModelObject clone(Model model) const override;

Expand Down
6 changes: 3 additions & 3 deletions openstudiocore/src/model/CoilHeatingDXMultiSpeed_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const;
virtual std::vector<ScheduleTypeKey> getScheduleTypeKeys(const Schedule& schedule) const override;

virtual unsigned inletPort() override;

Expand Down
4 changes: 2 additions & 2 deletions openstudiocore/src/model/CoilHeatingDXVariableSpeedSpeedData_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual ModelObject clone(Model model) const override;

Expand Down
4 changes: 2 additions & 2 deletions openstudiocore/src/model/CoilHeatingDXVariableSpeed_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual unsigned inletPort() override;

Expand Down
4 changes: 2 additions & 2 deletions ...diocore/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual ModelObject clone(Model model) const override;

Expand Down
4 changes: 2 additions & 2 deletions openstudiocore/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

virtual unsigned airInletPort() override;

Expand Down
8 changes: 4 additions & 4 deletions openstudiocore/src/model/CoilPerformanceDXCooling_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

//@}
/** @name Getters */
Expand Down Expand Up @@ -180,8 +180,8 @@ namespace detail {
//@}
/** @name Other */
//@{
ModelObject clone(Model model) const;
std::vector<ModelObject> children() const;
ModelObject clone(Model model) const override;
std::vector<ModelObject> children() const override;

//@}
protected:
Expand Down
14 changes: 7 additions & 7 deletions openstudiocore/src/model/CoilSystemCoolingDXHeatExchangerAssisted_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

//@}
/** @name Getters */
Expand All @@ -78,12 +78,12 @@ namespace detail {
/** @name Other */
//@{

unsigned inletPort();
unsigned outletPort();
unsigned inletPort() override;
unsigned outletPort() override;

bool addToNode(Node & node);
std::vector<ModelObject> children() const;
ModelObject clone(Model model) const;
bool addToNode(Node & node) override;
std::vector<ModelObject> children() const override;
ModelObject clone(Model model) const override;

//@}
protected:
Expand Down
10 changes: 5 additions & 5 deletions openstudiocore/src/model/CoilSystemCoolingWaterHeatExchangerAssisted_Impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ namespace detail {
/** @name Virtual Methods */
//@{

virtual const std::vector<std::string>& outputVariableNames() const;
virtual const std::vector<std::string>& outputVariableNames() const override;

virtual IddObjectType iddObjectType() const;
virtual IddObjectType iddObjectType() const override;

//@}
/** @name Getters */
Expand All @@ -79,11 +79,11 @@ namespace detail {
/** @name Other */
//@{

unsigned inletPort();
unsigned inletPort() override;

unsigned outletPort();
unsigned outletPort() override;

bool addToNode(Node & node);
bool addToNode(Node & node) override;

//@}
protected:
Expand Down
Loading

2 comments on commit 4dd0a22

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - x86_64-MacOS-10.9-clang: Tests Failed

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - i386-Windows-7-VisualStudio-12: OK (2304 of 2343 tests passed)

Build Badge Test Badge

Please sign in to comment.