Commit fa7911e6 authored by fogal1's avatar fogal1

Remove const on by-value return types.

I see this warning very often while waiting on compiles.  Since I
was changing a bunch of key header files (thus forcing a major
recompile), I figured it was a good time to fix this warning as
well.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8007 18c085ea-50e0-402c-830e-de6fd14e8384
parent 218be504
......@@ -857,9 +857,12 @@ Expression::FieldsEqual(int index_, const AttributeGroup *rhs) const
//
// Kathlen Bonnell, Tue Aug 1 08:26:14 PDT 2006
// Changed it to 10 for Curve expressions.
//
// Tom Fogal, Tue Jun 23 20:57:07 MDT 2009
// Const is ignored on by-value return types.
//
// ****************************************************************************
const int
int
Expression::GetNumTypes()
{
return 10;
......@@ -914,10 +917,13 @@ Expression::GetTypeString(const Expression::ExprType t)
// Modifications:
// Kathlen Bonnell, Tue Aug 1 08:26:14 PDT 2006
// Added CurveMeshVar.
//
// Tom Fogal, Tue Jun 23 20:58:01 MDT 2009
// Const is ignored on by-value return types.
//
// ****************************************************************************
const Expression::ExprType
Expression::ExprType
Expression::GetTypeId(const std::string s)
{
if (s == "Scalar Mesh Variable")
......
Function: GetNumTypes
Declaration: static const int GetNumTypes();
Declaration: static int GetNumTypes();
Definition:
// ****************************************************************************
// Method: Expression::GetNumTypes
......@@ -16,9 +16,12 @@ Definition:
//
// Kathlen Bonnell, Tue Aug 1 08:26:14 PDT 2006
// Changed it to 10 for Curve expressions.
//
// Tom Fogal, Tue Jun 23 20:57:07 MDT 2009
// Const is ignored on by-value return types.
//
// ****************************************************************************
const int
int
Expression::GetNumTypes()
{
return 10;
......@@ -68,7 +71,7 @@ Expression::GetTypeString(const Expression::ExprType t)
}
Function: GetTypeId
Declaration: static const Expression::ExprType GetTypeId(const std::string s);
Declaration: static Expression::ExprType GetTypeId(const std::string s);
Definition:
// ****************************************************************************
// Method: Expression::GetTypeId
......@@ -79,10 +82,13 @@ Definition:
// Modifications:
// Kathlen Bonnell, Tue Aug 1 08:26:14 PDT 2006
// Added CurveMeshVar.
//
// Tom Fogal, Tue Jun 23 20:58:01 MDT 2009
// Const is ignored on by-value return types.
//
// ****************************************************************************
const Expression::ExprType
Expression::ExprType
Expression::GetTypeId(const std::string s)
{
if (s == "Scalar Mesh Variable")
......
......@@ -134,9 +134,9 @@ public:
virtual bool FieldsEqual(int index, const AttributeGroup *rhs) const;
// User-defined methods
static const int GetNumTypes();
static int GetNumTypes();
static const char * GetTypeString(const Expression::ExprType t);
static const Expression::ExprType GetTypeId(const std::string s);
static Expression::ExprType GetTypeId(const std::string s);
// IDs that can be used to identify fields in case statements
enum {
......
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