Merge pull request #13395 from andrsd/pragma-fix

Fixing #pragma once
idaholab · May 9, 2019 · e2375fd · e2375fd
2 parents 709163a + e09af29
commit e2375fd
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/modules/fluid_properties/include/userobjects/SinglePhaseFluidProperties.h b/modules/fluid_properties/include/userobjects/SinglePhaseFluidProperties.h
@@ -279,7 +279,6 @@ class SinglePhaseFluidProperties : public FluidProperties
   virtual Real e_from_p_T(Real p, Real T) const;
   DualReal e_from_p_T(const DualReal & p, const DualReal & T) const;
   virtual Real e(Real pressure, Real temperature) const;
-  DualReal e_from_p_T(const DualReal & p, const DualReal & T) const;
 
   /**
    * Internal energy and its derivatives from pressure and temperature

diff --git a/unit/include/PorousFlowWaterVaporTest.h b/unit/include/PorousFlowWaterVaporTest.h
@@ -7,8 +7,7 @@
 //* Licensed under LGPL 2.1, please see LICENSE for details
 //* https://www.gnu.org/licenses/lgpl-2.1.html
 
-#ifndef POROUSFLOWWATERVAPORTEST_H
+#pragma once
-#define POROUSFLOWWATERVAPORTEST_H
 
 #include "MooseObjectUnitTest.h"
 #include "PorousFlowCapillaryPressureVG.h"
@@ -45,5 +44,3 @@ class PorousFlowWaterVaporTest : public MooseObjectUnitTest
   const PorousFlowWaterVapor * _fp;
   const Water97FluidProperties * _water_fp;
 };
-
-#endif // POROUSFLOWWATERVAPORTEST_H
diff --git a/unit/src/DelimitedFileReaderTest.C b/unit/src/DelimitedFileReaderTest.C
@@ -7,9 +7,6 @@
 //* Licensed under LGPL 2.1, please see LICENSE for details
 //* https://www.gnu.org/licenses/lgpl-2.1.html
 
-#ifndef DELIMITEDFILEREADERTEST_H
-#define DELIMITEDFILEREADERTEST_H
-
 #include "gtest/gtest.h"
 
 // MOOSE includes
@@ -421,5 +418,3 @@ TEST(DelimitedFileReader, Empty)
   reader.read();
   EXPECT_EQ(reader.getData(), std::vector<std::vector<double>>());
 }
-
-#endif