split 12mar09 patch - change 'char *' to 'const char *' in many places

This commit is contained in:
Mark Pictor
2011-07-10 10:38:26 -04:00
parent b6004b9775
commit 4cf16d7441
12 changed files with 35 additions and 35 deletions
+2 -2
View File
@@ -93,7 +93,7 @@ class ReplicateLinkNode : public SingleLinkNode {
ReplicateLinkNode() { _repNode = 0; }
~ReplicateLinkNode() { }
char *ClassName () { return "ReplicateLinkNode"; }
const char *ClassName () { return "ReplicateLinkNode"; }
MgrNode *ReplicateNode() { return _repNode; }
void ReplicateNode(MgrNode *rn) { _repNode = rn; }
@@ -121,7 +121,7 @@ class ReplicateList : public SingleLinkList {
BOOLEAN Remove(ReplicateLinkNode *rln);
BOOLEAN Remove(MgrNode *rn);
char *ClassName () { return "ReplicateList"; }
const char *ClassName () { return "ReplicateList"; }
};
///////////////////////////////////////////////////////////////////////////////
+9 -9
View File
@@ -55,7 +55,7 @@ class s_N279_file_identification : public SCLP23(Application_instance) {
#ifdef __O3DB__
void oodb_reInit();
#endif
char *Name () { return "File_Identification"; }
const char *Name () { return "File_Identification"; }
int opcode () { return 0 ; }
const SCLP23(String) & file_name() const;
void file_name (const char * x);
@@ -86,7 +86,7 @@ class s_N279_imp_level : public SCLP23(Application_instance) {
#ifdef __O3DB__
void oodb_reInit();
#endif
char *Name () { return "Imp_Level"; }
const char *Name () { return "Imp_Level"; }
int opcode () { return 1 ; }
const SCLP23(String) & implementation_level() const;
void implementation_level (const char * x);
@@ -121,7 +121,7 @@ class p21DIS_File_name : public SCLP23(Application_instance) {
#ifdef __O3DB__
void oodb_reInit();
#endif
char *Name () { return "File_Name"; }
const char *Name () { return "File_Name"; }
int opcode () { return 2 ; }
const SCLP23(String) & name() const;
void name (const char * x);
@@ -158,7 +158,7 @@ class p21DIS_File_description : public SCLP23(Application_instance) {
#ifdef __O3DB__
void oodb_reInit();
#endif
char *Name () { return "File_Description"; }
const char *Name () { return "File_Description"; }
int opcode () { return 3 ; }
StringAggregate & description();
void description (StringAggregate & x);
@@ -181,7 +181,7 @@ class s_N279_classification : public SCLP23(Application_instance) {
#ifdef __O3DB__
void oodb_reInit();
#endif
char *Name () { return "S_Classification"; }
const char *Name () { return "S_Classification"; }
int opcode () { return 4 ; }
const SCLP23(String) & security_classification() const;
void security_classification (const char * x);
@@ -202,7 +202,7 @@ class s_N279_file_description : public SCLP23(Application_instance) {
#ifdef __O3DB__
void oodb_reInit();
#endif
char *Name () { return "S_File_Description"; }
const char *Name () { return "S_File_Description"; }
int opcode () { return 5 ; }
const SCLP23(String) & description() const;
void description (const char * x);
@@ -223,7 +223,7 @@ class p21DIS_Maxsig : public SCLP23(Application_instance) {
#ifdef __O3DB__
void oodb_reInit();
#endif
char *Name () { return "Maxsig"; }
const char *Name () { return "Maxsig"; }
int opcode () { return 6 ; }
SCLP23(Integer) maximum_significant_digit();
void maximum_significant_digit (SCLP23(Integer) x);
@@ -244,7 +244,7 @@ class p21DIS_Classification : public SCLP23(Application_instance) {
#ifdef __O3DB__
void oodb_reInit();
#endif
char *Name () { return "Classification"; }
const char *Name () { return "Classification"; }
int opcode () { return 7 ; }
const SCLP23(String) & security_classification() const;
void security_classification (const char * x);
@@ -266,7 +266,7 @@ class p21DIS_File_schema : public SCLP23(Application_instance) {
#ifdef __O3DB__
void oodb_reInit();
#endif
char *Name () { return "File_Schema"; }
const char *Name () { return "File_Schema"; }
int opcode () { return 8 ; }
StringAggregate & schema_identifiers();
void schema_identifiers (StringAggregate & x);
+1 -1
View File
@@ -1679,7 +1679,7 @@ class SelectTypeDescriptor : public TypeDescriptor {
SelectTypeDescriptor (int b, const char * nm, PrimitiveType ft,
Schema *origSchema,
char * d, SelectCreator f =0 )
const char * d, SelectCreator f =0 )
: TypeDescriptor (nm, ft, origSchema, d),
_unique_elements (b), CreateNewSelect(f)
{ }
+2 -2
View File
@@ -65,11 +65,11 @@ CheckRemainingInput(istream &in, ErrorDescriptor *err,
const char *tokenList); // e.g. ",)"
extern SCLP23(Application_instance) *
ReadEntityRef(istream &in, ErrorDescriptor *err, char *tokenList,
ReadEntityRef(istream &in, ErrorDescriptor *err, const char *tokenList,
InstMgr * instances, int addFileId);
extern SCLP23(Application_instance) *
ReadEntityRef(const char * s, ErrorDescriptor *err, char *tokenList,
ReadEntityRef(const char * s, ErrorDescriptor *err, const char *tokenList,
InstMgr * instances, int addFileId);
extern Severity
+6 -6
View File
@@ -79,7 +79,7 @@ void IStreamState(istream &in)
int
ReadInteger(SCLP23(Integer) &val, istream &in, ErrorDescriptor *err,
char *tokenList)
const char* tokenList)
{
SCLP23(Integer) i = 0;
in >> ws;
@@ -104,7 +104,7 @@ ReadInteger(SCLP23(Integer) &val, istream &in, ErrorDescriptor *err,
int
ReadInteger(SCLP23(Integer) &val, const char *s, ErrorDescriptor *err,
char *tokenList)
const char* tokenList)
{
istringstream in((char *)s);
return ReadInteger(val, in, err, tokenList);
@@ -288,7 +288,7 @@ WriteReal(SCLP23(Real) val, ostream &out)
int
ReadReal(SCLP23(Real) &val, istream &in, ErrorDescriptor *err,
char *tokenList)
const char *tokenList)
{
SCLP23(Real) d = 0;
@@ -427,7 +427,7 @@ ReadReal(SCLP23(Real) &val, istream &in, ErrorDescriptor *err,
int
ReadReal(SCLP23(Real) &val, const char *s, ErrorDescriptor *err,
char *tokenList)
const char *tokenList)
{
istringstream in((char *)s);
return ReadReal(val, in, err, tokenList);
@@ -508,7 +508,7 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
int
ReadNumber(SCLP23(Real) &val, istream &in, ErrorDescriptor *err,
char *tokenList)
const char *tokenList)
{
SCLP23(Real) d = 0;
in >> ws;
@@ -532,7 +532,7 @@ ReadNumber(SCLP23(Real) &val, istream &in, ErrorDescriptor *err,
int
ReadNumber(SCLP23(Real) &val, const char *s, ErrorDescriptor *err,
char *tokenList)
const char *tokenList)
{
istringstream in((char *)s);
return ReadNumber(val, in, err, tokenList);
+6 -6
View File
@@ -13,11 +13,11 @@ extern void IStreamState(istream &in);
extern int
ReadInteger(SCLP23(Integer) &val, istream &in, ErrorDescriptor *err,
char *tokenList);
const char *tokenList);
extern int
ReadInteger(SCLP23(Integer) &val, const char *s, ErrorDescriptor *err,
char *tokenList);
const char *tokenList);
extern Severity
IntValidLevel (const char *attrValue, ErrorDescriptor *err,
@@ -31,11 +31,11 @@ WriteReal(SCLP23(Real) val, ostream &out);
extern int
ReadReal(SCLP23(Real) &val, istream &in, ErrorDescriptor *err,
char *tokenList);
const char *tokenList);
extern int
ReadReal(SCLP23(Real) &val, const char *s, ErrorDescriptor *err,
char *tokenList);
const char *tokenList);
extern Severity
RealValidLevel (const char *attrValue, ErrorDescriptor *err,
@@ -43,11 +43,11 @@ RealValidLevel (const char *attrValue, ErrorDescriptor *err,
extern int
ReadNumber(SCLP23(Real) &val, istream &in, ErrorDescriptor *err,
char *tokenList);
const char *tokenList);
extern int
ReadNumber(SCLP23(Real) &val, const char *s, ErrorDescriptor *err,
char *tokenList);
const char *tokenList);
extern Severity
NumberValidLevel (const char *attrValue, ErrorDescriptor *err,
+1 -1
View File
@@ -373,7 +373,7 @@ typedef SCLP23(Application_instance)* STEPentityPtr;
typedef SCLP23(Application_instance)* STEPentityH;
extern SCLP23(Application_instance) *
ReadEntityRef(istream &in, ErrorDescriptor *err, char *tokenList,
ReadEntityRef(istream &in, ErrorDescriptor *err, const char *tokenList,
InstMgr * instances, int addFileId);
#define SdaiInteger SCLP23(Integer)
+2 -2
View File
@@ -882,7 +882,7 @@ SCLP23(Application_instance)::STEPread(int id, int idIncr,
///////////////////////////////////////////////////////////////////////////////
SCLP23(Application_instance) *
ReadEntityRef(istream &in, ErrorDescriptor *err, char *tokenList,
ReadEntityRef(istream &in, ErrorDescriptor *err, const char* tokenList,
InstMgr * instances, int addFileId)
{
char c;
@@ -983,7 +983,7 @@ ReadEntityRef(istream &in, ErrorDescriptor *err, char *tokenList,
///////////////////////////////////////////////////////////////////////////////
SCLP23(Application_instance) *
ReadEntityRef(const char * s, ErrorDescriptor *err, char *tokenList,
ReadEntityRef(const char * s, ErrorDescriptor *err, const char* tokenList,
InstMgr * instances, int addFileId)
{
istringstream in((char *)s);
+1 -1
View File
@@ -62,7 +62,7 @@ const char * SCLP23(Select)::Error()
return _error.DetailMsg();
} /** end function **/
void SCLP23(Select)::Error( char * e )
void SCLP23(Select)::Error( const char * e )
{ /** fn Error **/
_error.DetailMsg( e );
} /** end function **/
+1 -1
View File
@@ -72,7 +72,7 @@ class SCLP23_NAME(Select) {
Severity severity() const;
Severity severity( Severity );
const char *Error();
void Error( char * );
void Error( const char * );
// clears select's error
void ClearError();
// clears error
+2 -2
View File
@@ -349,7 +349,7 @@ class ComplexCollect {
{ return ( clists ? clists->isDependent( ent ) : 0 ); }
// One of our clists shows that ent will have to be instantiated
// using external mapping (see Part 21, sect 11.2.5.1).
void write( char * );
void write( const char * );
ComplexList *clists;
@@ -359,6 +359,6 @@ class ComplexCollect {
// Standalone function which can be used to print out the complex info in an
// express file (prints out CCollect, CList & EntList instant. statements):
void print_complex( ComplexCollect &, char * );
void print_complex( ComplexCollect &, const char * );
#endif
+2 -2
View File
@@ -15,7 +15,7 @@
// Local function prototypes:
static void writeheader( ostream &, int );
void print_complex( ComplexCollect &collect, char *filename )
void print_complex( ComplexCollect &collect, const char *filename )
/*
* Standalone function called from fedex_plus. Takes a ComplexCollect
* and writes its contents to a file (filename) which can be used to
@@ -36,7 +36,7 @@ void print_complex( ComplexCollect &collect, char *filename )
collect.write( filename );
}
void ComplexCollect::write( char *fname )
void ComplexCollect::write( const char *fname )
/*
* Generates C++ code in os which may be compiled and run to create a
* ComplexCollect structure. Functions are called to write out the