Suppress some cppcheck warnings internal to code

NREL · Jul 5, 2014 · 9ea3efa · 9ea3efa · nrel-bot · Jul 5, 2014
1 parent 15c5ed7
commit 9ea3efa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/openstudiocore/src/utilities/data/CalibrationResult.cpp b/openstudiocore/src/utilities/data/CalibrationResult.cpp
@@ -56,6 +56,7 @@ namespace openstudio {
       return boost::none;
     }
     try{
+      // cppcheck-suppress unusedScopedObject
       Date(test->valueAsString());
     }catch(const std::exception&){
       LOG(Warn,"Cannot create CalibrationBillingPeriod from Attribute with improper 'startDate'.");
@@ -269,6 +270,7 @@ namespace openstudio {
       return boost::none;
     }
     try{
+      // cppcheck-suppress unusedScopedObject
       FuelType(test->valueAsString());
     }catch(const std::exception&){
       LOG(Warn,"Cannot create CalibrationUtilityBill from Attribute with improper 'fuelType'.");
@@ -281,6 +283,7 @@ namespace openstudio {
       return boost::none;
     }
     try{
+      // cppcheck-suppress unusedScopedObject
       InstallLocationType(test->valueAsString());
     }catch(const std::exception&){
       LOG(Warn,"Cannot create CalibrationUtilityBill from Attribute with improper 'meterInstallLocation'.");

diff --git a/openstudiocore/src/utilities/idd/Test/CommentRegex_GTest.cpp b/openstudiocore/src/utilities/idd/Test/CommentRegex_GTest.cpp
@@ -92,12 +92,14 @@ TEST_F(IddFixture,CommentRegex_Lines) {
   line = "  \t\t !-IdfEditor-style comments are ok too.";
   EXPECT_TRUE(boost::regex_match(line,matches,commentWhitespaceOnlyLine()));
   ASSERT_EQ(static_cast<unsigned>(2),matches.size());
+  // cppcheck-suppress arrayIndexOutOfBounds
   match = std::string(matches[1].first,matches[1].second);
   EXPECT_EQ("-IdfEditor-style comments are ok too.",match);
 
   line = " !- One last boring comment, with some math: 1 + 1 = (1^1)*2.";
   EXPECT_TRUE(boost::regex_match(line,matches,commentWhitespaceOnlyLine()));
   ASSERT_EQ(static_cast<unsigned>(2),matches.size());
+  // cppcheck-suppress arrayIndexOutOfBounds
   match = std::string(matches[1].first,matches[1].second);
   EXPECT_EQ("- One last boring comment, with some math: 1 + 1 = (1^1)*2.",match);
 
@@ -113,20 +115,23 @@ TEST_F(IddFixture,CommentRegex_Lines) {
   EXPECT_FALSE(matches.empty());
   ASSERT_EQ(static_cast<unsigned>(2),matches.size());
   EXPECT_TRUE(matches[0].matched);
+  // cppcheck-suppress arrayIndexOutOfBounds
   EXPECT_FALSE(matches[1].matched);
 
   line = "     \t \t";
   EXPECT_TRUE(boost::regex_match(line,matches,editorCommentWhitespaceOnlyLine()));
   EXPECT_FALSE(matches.empty());
   ASSERT_EQ(static_cast<unsigned>(2),matches.size());
   EXPECT_TRUE(matches[0].matched);
+  // cppcheck-suppress arrayIndexOutOfBounds
   EXPECT_FALSE(matches[1].matched);
 
   line = "  ";
   EXPECT_TRUE(boost::regex_match(line,matches,editorCommentWhitespaceOnlyLine()));
   EXPECT_FALSE(matches.empty());
   ASSERT_EQ(static_cast<unsigned>(2),matches.size());
   EXPECT_TRUE(matches[0].matched);
+  // cppcheck-suppress arrayIndexOutOfBounds
   EXPECT_FALSE(matches[1].matched);
 
   line = "  \t !A plain comment, no space";
@@ -138,12 +143,14 @@ TEST_F(IddFixture,CommentRegex_Lines) {
   line = "  \t\t !-IdfEditor-style comments are ok too.";
   EXPECT_TRUE(boost::regex_match(line,matches,editorCommentWhitespaceOnlyLine()));
   ASSERT_EQ(static_cast<unsigned>(2),matches.size());
+  // cppcheck-suppress arrayIndexOutOfBounds
   match = std::string(matches[1].first,matches[1].second);
   EXPECT_EQ("IdfEditor-style comments are ok too.",match);
 
   line = " !- One last boring comment, with some math: 1 + 1 = (1^1)*2.";
   EXPECT_TRUE(boost::regex_match(line,matches,editorCommentWhitespaceOnlyLine()));
   ASSERT_EQ(static_cast<unsigned>(2),matches.size());
+  // cppcheck-suppress arrayIndexOutOfBounds
   match = std::string(matches[1].first,matches[1].second);
   EXPECT_EQ(" One last boring comment, with some math: 1 + 1 = (1^1)*2.",match);
 

diff --git a/openstudiocore/src/utilities/idd/Test/IddField_GTest.cpp b/openstudiocore/src/utilities/idd/Test/IddField_GTest.cpp
@@ -98,5 +98,6 @@ TEST_F(IddFixture, IddField) {
   fields[3].print(ss,false);
   OptionalIddField fieldClone = IddField::load(fields[3].name(),ss.str(),"Lights");
   ASSERT_TRUE(fieldClone);
+  // cppcheck-suppress arrayIndexOutOfBounds
   EXPECT_EQ(fields[3],*fieldClone);
 }