Skip to content

Hotfix #5426 - fix cppcheck warnings #5428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmarrec merged 2 commits into from
Jun 11, 2025
Merged

Hotfix #5426 - fix cppcheck warnings #5428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0936a3c
Hotfix #5426 - fix cppcheck warnings
jmarrec Jun 11, 2025
a6734bf
Unrelated but clarify cppcheck version in workflow
jmarrec Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cppcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install cppcheck
shell: bash
run: |
# I made a PPA on launchpad where I built cppcheck 2.3 for focal
# I made a PPA on launchpad where I built cppcheck 2.15 for 24.04
sudo add-apt-repository ppa:jmarrec/ppa
sudo apt update
sudo apt install -y cppcheck
Expand Down
10 changes: 0 additions & 10 deletions src/model/StandardGlazing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,11 +502,6 @@ namespace model {
return getImpl<detail::StandardGlazing_Impl>()->solarTransmittance();
}

// cppcheck-suppress [duplInheritedMember] for documentation purposes
double StandardGlazing::thickness() const {
return getImpl<detail::StandardGlazing_Impl>()->thickness();
}

boost::optional<double> StandardGlazing::solarTransmittanceatNormalIncidence() const {
return getImpl<detail::StandardGlazing_Impl>()->solarTransmittanceatNormalIncidence();
}
Expand Down Expand Up @@ -607,11 +602,6 @@ namespace model {
return getImpl<detail::StandardGlazing_Impl>()->setSolarTransmittance(value);
}

// cppcheck-suppress [duplInheritedMember] for documentation purposes
bool StandardGlazing::setThickness(double thickness) {
return getImpl<detail::StandardGlazing_Impl>()->setThickness(thickness);
}

bool StandardGlazing::setSolarTransmittanceatNormalIncidence(double solarTransmittanceatNormalIncidence) {
return getImpl<detail::StandardGlazing_Impl>()->setSolarTransmittanceatNormalIncidence(solarTransmittanceatNormalIncidence);
}
Expand Down
4 changes: 2 additions & 2 deletions src/model/StandardGlazing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace model {

std::string opticalDataType() const;

double thickness() const;
// double thickness() const; // inherited from Glazing < FenestrationMaterial < Material

/** deprecated **/
boost::optional<std::string> windowGlassSpectralDataSetName() const;
Expand Down Expand Up @@ -111,7 +111,7 @@ namespace model {
bool setWindowGlassSpectralDataSet(const MaterialPropertyGlazingSpectralData& spectralData);
void resetWindowGlassSpectralDataSet();

bool setThickness(double thickness);
// bool setThickness(double thickness); // inherited from Glazing < FenestrationMaterial < Material

bool setSolarTransmittance(double value);

Expand Down
6 changes: 3 additions & 3 deletions src/model/ThermochromicGlazing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ namespace model {
return opticalDataTemperature() >= other.opticalDataTemperature();
}

std::ostream& operator<<(std::ostream& out, const openstudio::model::ThermochromicGroup& ThermochromicGroup) {
out << "(StandardGlazing = '" << ThermochromicGroup.standardGlazing().nameString()
<< "', Optional Data Temperature = " << ThermochromicGroup.opticalDataTemperature() << ")";
std::ostream& operator<<(std::ostream& out, const openstudio::model::ThermochromicGroup& thermochromicGroup) {
out << "(StandardGlazing = '" << thermochromicGroup.standardGlazing().nameString()
<< "', Optional Data Temperature = " << thermochromicGroup.opticalDataTemperature() << ")";
return out;
}

Expand Down