Skip to content
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

Panzer: fix clang warnings #4058

Merged
merged 1 commit into from
Dec 14, 2018
Merged

Panzer: fix clang warnings #4058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 packages/panzer/adapters-stk/src/Panzer_STK_LocalMeshUtilities.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
namespace panzer
{
template <typename LO, typename GO>
class LocalMeshInfo;
struct LocalMeshInfo;
Copy link
Member

Choose a reason for hiding this comment

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

Is the actually type a 'struct' and not a 'class'?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes - clang picked up on the fact that the object was a "struct" but some files had forward declarations using "class". I just cleaned up all the forward declares.

}

namespace panzer_stk
Expand Down
2 changes: 1 addition & 1 deletion packages/panzer/adapters-stk/src/Panzer_STK_WorksetFactory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
namespace panzer
{
template<typename LO, typename GO>
class LocalMeshInfo;
struct LocalMeshInfo;
}

namespace panzer_stk {
Expand Down
24 changes: 12 additions & 12 deletions packages/panzer/disc-fe/src/Panzer_ModelEvaluator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,16 @@ class ModelEvaluator
//@{

/** \brief . */
Teuchos::RCP<const Thyra::VectorSpaceBase<Scalar> > get_x_space() const;
Teuchos::RCP<const Thyra::VectorSpaceBase<Scalar> > get_x_space() const override;

/** \brief . */
Teuchos::RCP<const Thyra::VectorSpaceBase<Scalar> > get_f_space() const;
Teuchos::RCP<const Thyra::VectorSpaceBase<Scalar> > get_f_space() const override;

/** \brief . */
Teuchos::RCP<const Teuchos::Array<std::string> > get_p_names(int i) const;
Teuchos::RCP<const Teuchos::Array<std::string> > get_p_names(int i) const override;

/** \brief . */
Teuchos::RCP<const Thyra::VectorSpaceBase<Scalar> > get_p_space(int i) const;
Teuchos::RCP<const Thyra::VectorSpaceBase<Scalar> > get_p_space(int i) const override;

/** \brief . */
Teuchos::ArrayView<const std::string> get_g_names(int i) const override;
Expand All @@ -121,21 +121,21 @@ class ModelEvaluator
const std::string & get_g_name(int i) const;

/** \brief . */
Teuchos::RCP<const Thyra::VectorSpaceBase<Scalar> > get_g_space(int i) const;
Teuchos::RCP<const Thyra::VectorSpaceBase<Scalar> > get_g_space(int i) const override;

/** \brief . */
Teuchos::RCP<Thyra::LinearOpBase<Scalar> > create_W_op() const;
Teuchos::RCP<Thyra::LinearOpBase<Scalar> > create_W_op() const override;

/** \brief . */
Teuchos::RCP<const Thyra::LinearOpWithSolveFactoryBase<Scalar> > get_W_factory() const;
Teuchos::RCP<const Thyra::LinearOpWithSolveFactoryBase<Scalar> > get_W_factory() const override;

/** \brief . */
Teuchos::RCP<Thyra::LinearOpBase<Scalar> > create_DfDp_op(int i) const;
Teuchos::RCP<Thyra::LinearOpBase<Scalar> > create_DfDp_op(int i) const override;

/** \brief . */
Thyra::ModelEvaluatorBase::InArgs<Scalar> createInArgs() const;
Thyra::ModelEvaluatorBase::InArgs<Scalar> createInArgs() const override;

Thyra::ModelEvaluatorBase::InArgs<Scalar> getNominalValues() const;
Thyra::ModelEvaluatorBase::InArgs<Scalar> getNominalValues() const override;

//@}

Expand Down Expand Up @@ -503,11 +503,11 @@ class ModelEvaluator
//@{

/** \brief . */
Thyra::ModelEvaluatorBase::OutArgs<Scalar> createOutArgsImpl() const;
Thyra::ModelEvaluatorBase::OutArgs<Scalar> createOutArgsImpl() const override;

/** \brief . */
virtual void evalModelImpl(const Thyra::ModelEvaluatorBase::InArgs<Scalar> &inArgs,
const Thyra::ModelEvaluatorBase::OutArgs<Scalar> &outArgs) const;
const Thyra::ModelEvaluatorBase::OutArgs<Scalar> &outArgs) const override;

//@}

Expand Down
2 changes: 1 addition & 1 deletion packages/panzer/disc-fe/src/Panzer_SetupPartitionedWorksetUtilities.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace panzer
class WorksetDescriptor;
struct WorksetNeeds;
template<typename LO, typename GO>
class LocalMeshInfo;
struct LocalMeshInfo;
}

namespace panzer
Expand Down
2 changes: 1 addition & 1 deletion packages/panzer/disc-fe/src/Panzer_SubcellConnectivity.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
namespace panzer {

template <typename LO, typename GO>
class LocalMeshPartition;
struct LocalMeshPartition;

class SubcellConnectivity
{
Expand Down
2 changes: 1 addition & 1 deletion packages/panzer/disc-fe/src/Panzer_Workset.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace panzer {
struct WorksetNeeds;

template<typename LO, typename GO>
class LocalMeshPartition;
struct LocalMeshPartition;

class SubcellConnectivity;

Expand Down