Merge branch 'macos'

Author: Dilawar Singh

basecode/ElementValueFinfo.h

@@ -9,6 +9,8 @@
 #ifndef _ELEMENT_VALUE_FINFO_H
 #define _ELEMENT_VALUE_FINFO_H
 
+#include <cctype>
+
 /**
  * This variant of ValueFinfo provides facilities to set and get
  * values of fields that require information about the managing Element 
@@ -27,14 +29,14 @@ template < class T, class F > class ElementValueFinfo: public ValueFinfoBase
 			: ValueFinfoBase( name, doc )
 		{
 				string setname = "set" + name;
-				setname[3] = toupper( setname[3] );
+				setname[3] = std::toupper( setname[3] );
 				set_ = new DestFinfo(
 					setname,
 					"Assigns field value.",
 					new EpFunc1< T, F >( setFunc ) );
 
 				string getname = "get" + name;
-				getname[3] = toupper( getname[3] );
+				getname[3] = std::toupper( getname[3] );
 				get_ = new DestFinfo(
 					getname,
 					"Requests field value. The requesting Element must "
@@ -79,7 +81,7 @@ template < class T, class F > class ReadOnlyElementValueFinfo: public ValueFinfo
 			: ValueFinfoBase( name, doc )
 		{
 				string getname = "get" + name;
-				getname[3] = toupper( getname[3] );
+				getname[3] = std::toupper( getname[3] );
 				get_ = new DestFinfo(
 					getname,
 					"Requests field value. The requesting Element must "

basecode/LookupElementValueFinfo.h

@@ -30,14 +30,14 @@ template < class T, class L, class F > class LookupElementValueFinfo: public Loo
 			: LookupValueFinfoBase( name, doc )
 		{
 				string setname = "set" + name;
-				setname[3] = toupper( setname[3] );
+				setname[3] = std::toupper( setname[3] );
 				set_ = new DestFinfo(
 					setname,
 					"Assigns field value.",
 					new EpFunc2< T, L, F >( setFunc ) );
 
 				string getname = "get" + name;
-				getname[3] = toupper( getname[3] );
+				getname[3] = std::toupper( getname[3] );
 				get_ = new DestFinfo(
 					getname,
 					"Requests field value. The requesting Element must "
@@ -90,7 +90,7 @@ template < class T, class L, class F >
 			: LookupValueFinfoBase( name, doc )
 		{
 				string getname = "get" + name;
-				getname[3] = toupper( getname[3] );
+				getname[3] = std::toupper( getname[3] );
 				get_ = new DestFinfo(
 					getname,
 					"Requests field value. The requesting Element must "

basecode/SetGet.h

@@ -30,7 +30,7 @@ template< class T, class A >
 A localGet( const Eref& er, string field )
 {
 	string fullFieldName = "get" + field;
-	fullFieldName[3] = toupper( fullFieldName[3] );
+	fullFieldName[3] = std::toupper( fullFieldName[3] );
 	const Finfo* finfo = er.element()->cinfo()->findFinfo( fullFieldName );
 	assert( finfo );
 
@@ -245,23 +245,23 @@ template< class A > class Field: public SetGet1< A >
 		static bool set( const ObjId& dest, const string& field, A arg )
 		{
 			string temp = "set" + field;
-			temp[3] = toupper( temp[3] );
+			temp[3] = std::toupper( temp[3] );
 			return SetGet1< A >::set( dest, temp, arg );
 		}
 
 		static bool setVec( ObjId destId, const string& field, 
 			const vector< A >& arg )
 		{
 			string temp = "set" + field;
-			temp[3] = toupper( temp[3] );
+			temp[3] = std::toupper( temp[3] );
 			return SetGet1< A >::setVec( destId, temp, arg );
 		}
 
 		static bool setRepeat( ObjId destId, const string& field, 
 			A arg )
 		{
 			string temp = "set" + field;
-			temp[3] = toupper( temp[3] );
+			temp[3] = std::toupper( temp[3] );
 			return SetGet1< A >::setRepeat( destId, temp, arg );
 		}
 
@@ -286,7 +286,7 @@ template< class A > class Field: public SetGet1< A >
 			ObjId tgt( dest );
 			FuncId fid;
 			string fullFieldName = "get" + field;
-			fullFieldName[3] = toupper( fullFieldName[3] );
+			fullFieldName[3] = std::toupper( fullFieldName[3] );
 			const OpFunc* func = SetGet::checkSet( fullFieldName, tgt, fid );
 			const GetOpFuncBase< A >* gof = 
 					dynamic_cast< const GetOpFuncBase< A >* >( func );
@@ -321,7 +321,7 @@ template< class A > class Field: public SetGet1< A >
 			ObjId tgt( dest );
 			FuncId fid;
 			string fullFieldName = "get" + field;
-			fullFieldName[3] = toupper( fullFieldName[3] );
+			fullFieldName[3] = std::toupper( fullFieldName[3] );
 			const OpFunc* func = SetGet::checkSet( fullFieldName, tgt, fid );
 			const GetOpFuncBase< A >* gof = 
 					dynamic_cast< const GetOpFuncBase< A >* >( func );
@@ -468,7 +468,7 @@ template< class L, class A > class LookupField: public SetGet2< L, A >
 			L index, A arg )
 		{
 			string temp = "set" + field;
-			temp[3] = toupper( temp[3] );
+			temp[3] = std::toupper( temp[3] );
 			return SetGet2< L, A >::set( dest, temp, index, arg );
 		}
 
@@ -480,7 +480,7 @@ template< class L, class A > class LookupField: public SetGet2< L, A >
 			const vector< L >& index, const vector< A >& arg )
 		{
 			string temp = "set" + field;
-			temp[3] = toupper( temp[3] );
+			temp[3] = std::toupper( temp[3] );
 			return SetGet2< L, A >::setVec( destId, temp, index, arg );
 		}
 
@@ -494,7 +494,7 @@ template< class L, class A > class LookupField: public SetGet2< L, A >
 			const vector< L >& index, const vector< A >& arg )
 		{
 			string temp = "set" + field;
-			temp[3] = toupper( temp[3] );
+			temp[3] = std::toupper( temp[3] );
 			return SetGet2< L, A >::setVec( dest, temp, index, arg );
 		}
 
@@ -534,7 +534,7 @@ template< class L, class A > class LookupField: public SetGet2< L, A >
 			ObjId tgt( dest );
 			FuncId fid;
 			string fullFieldName = "get" + field;
-			fullFieldName[3] = toupper( fullFieldName[3] );
+			fullFieldName[3] = std::toupper( fullFieldName[3] );
 			const OpFunc* func = SetGet::checkSet( fullFieldName, tgt, fid);
 			const LookupGetOpFuncBase< L, A >* gof = 
 				dynamic_cast< const LookupGetOpFuncBase< L, A >* >( func );
@@ -577,7 +577,7 @@ template< class L, class A > class LookupField: public SetGet2< L, A >
 			ObjId tgt( dest );
 			FuncId fid;
 			string fullFieldName = "get" + field;
-			fullFieldName[3] = toupper( fullFieldName[3] );
+			fullFieldName[3] = std::toupper( fullFieldName[3] );
 			const OpFunc* func = SetGet::checkSet( fullFieldName, tgt, fid );
 			const LookupGetOpFuncBase< L, A >* gof = 
 				dynamic_cast< const LookupGetOpFuncBase< L, A >* >( func );

pymoose/mfield.cpp

@@ -512,7 +512,7 @@ extern "C" {
             RAISE_INVALID_ID(NULL, "moose_ElementField_getNum");
         }
 		string name = self->name;
-		name[0] = toupper( name[0] );
+		name[0] = std::toupper( name[0] );
         unsigned int num = Field<unsigned int>::get(self->myoid, "numField");
         return Py_BuildValue("I", num);
     }