some const char corrections including remaining changes from SCL git 4cf16d7

Nicholas Reed · Nicholas Reed · commit 377d8f06a0d7 · 2012-04-24T22:17:06.000Z
diff --git a/src/clstepcore/ExpDict.h b/src/clstepcore/ExpDict.h
@@ -1728,14 +1728,14 @@ class ArrayTypeDescriptor  :    public AggrTypeDescriptor  {
         SDAI_LOGICAL  _optionalElements ;
     public:
 
-        ArrayTypeDescriptor( ) : _optionalElements( ( char * )"UNKNOWN_TYPE" ) { }
+        ArrayTypeDescriptor( ) : _optionalElements( "UNKNOWN_TYPE" ) { }
         ArrayTypeDescriptor( Logical optElem ) : _optionalElements( optElem )
         { }
         ArrayTypeDescriptor( const char * nm, PrimitiveType ft,
                              Schema * origSchema, const char * d,
                              AggregateCreator f = 0 )
             : AggrTypeDescriptor( nm, ft, origSchema, d, f ),
-              _optionalElements( ( char * )"UNKNOWN_TYPE" )
+              _optionalElements( "UNKNOWN_TYPE" )
         { }
 
         virtual ~ArrayTypeDescriptor() {}
@@ -1863,7 +1863,7 @@ class StringTypeDescriptor  :    public TypeDescriptor  {
         SDAI_LOGICAL  _fixedSize ;
     public:
 
-        StringTypeDescriptor( ) : _fixedSize( ( char * )"UNKNOWN_TYPE" ) {
+        StringTypeDescriptor( ) : _fixedSize( "UNKNOWN_TYPE" ) {
             _width = 0;
         }
         virtual ~StringTypeDescriptor() { }
diff --git a/src/fedex_plus/complexSupport.h b/src/fedex_plus/complexSupport.h
@@ -428,7 +428,7 @@ class ComplexCollect {
         }
         // 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;
 
@@ -438,6 +438,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
diff --git a/src/fedex_plus/write.cc b/src/fedex_plus/write.cc
@@ -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
@@ -35,7 +35,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
diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc
@@ -34,7 +34,7 @@ int main( int argc, char * argv[] ) {
     Registry  registry( SchemaInit );
     InstMgr   instance_list;
     STEPfile  sfile( registry, instance_list );
-    char   *  flnm;
+    const char   *  flnm;
 
     cout << "\nEXAMPLE :  load file ..." << endl;
     if( argc >= 2 ) {
