Commit 7d279004 authored by Lynn Garren's avatar Lynn Garren
Browse files

cleanup gcc 4.7 warnings

parent 3fe98450
......@@ -31,10 +31,10 @@ namespace Genfun {
inline const std::string & name() const;
// Returns the order:
inline const unsigned int order() const;
inline unsigned int order() const;
// Returns the number of steps:
inline const unsigned int nSteps() const;
inline unsigned int nSteps() const;
// Write access to elements:
inline double & A(unsigned int i, unsigned int j);
......
......@@ -9,19 +9,19 @@ namespace Genfun {
const unsigned int ButcherTableau::order() const{
unsigned int ButcherTableau::order() const{
return _order;
}
const unsigned int ButcherTableau::nSteps() const{
unsigned int ButcherTableau::nSteps() const{
return _A.size();
}
// don't generate warnings about intentional shadowing
#if defined __GNUC__
#if __GNUC__ > 3 && __GNUC_MINOR__ > 5
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#endif
......@@ -53,7 +53,7 @@ namespace Genfun {
}
#if defined __GNUC__
#if __GNUC__ > 3 && __GNUC_MINOR__ > 5
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
#pragma GCC diagnostic pop
#endif
#endif
......
......@@ -32,13 +32,13 @@ namespace Genfun {
inline const std::string & name() const;
// Returns the order of the main formula
inline const unsigned int order() const;
inline unsigned int order() const;
// Returns the order of the controlling formula
inline const unsigned int orderHat() const;
inline unsigned int orderHat() const;
// Returns the number of steps:
inline const unsigned int nSteps() const;
inline unsigned int nSteps() const;
// Write access to elements:
inline double & A(unsigned int i, unsigned int j);
......
......@@ -13,24 +13,24 @@ namespace Genfun {
const unsigned int ExtendedButcherTableau::order() const{
unsigned int ExtendedButcherTableau::order() const{
return _order;
}
const unsigned int ExtendedButcherTableau::orderHat() const{
unsigned int ExtendedButcherTableau::orderHat() const{
return _orderHat;
}
const unsigned int ExtendedButcherTableau::nSteps() const{
unsigned int ExtendedButcherTableau::nSteps() const{
return _A.size();
}
// don't generate warnings about intentional shadowing
#if defined __GNUC__
#if __GNUC__ > 3 && __GNUC_MINOR__ > 5
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#endif
......@@ -62,7 +62,7 @@ namespace Genfun {
}
#if defined __GNUC__
#if __GNUC__ > 3 && __GNUC_MINOR__ > 5
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
#pragma GCC diagnostic pop
#endif
#endif
......
......@@ -1487,7 +1487,7 @@ do_nothing_deleter::operator () ( void const * ) const
#if defined __GNUC__
#if __GNUC__ > 3 && __GNUC_MINOR__ > 5
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
#pragma GCC diagnostic pop
#endif
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment