Skip to content

Commit 6d7d08e

Browse files
author
Christopher Sean Morrison
committed
apply sf patch 3376896 (All instances of SCLstring changed to std::string) from lainiwakurax. patch converts scl converts almost all instances of SCLstring in SCL to standard STL strings. tested minimally with a few ap203 conversions that all seemed to parse and convert equivalently. outstanding.
1 parent 8a9c6a7 commit 6d7d08e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+719
-708
lines changed

‎src/cldai/sdaiDaObject.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class SCLP23_NAME(PID) : public SCLP23_NAME(sdaiObject)
6161
The Datestore_type attribute shall identify the type of the underlying
6262
datastore.
6363
*/
64-
char* Datastore_type() const { return (char*) _datastore_type.chars(); }
64+
char* Datastore_type() const { return const_cast<char *>(_datastore_type.c_str()); }
6565
void Datastore_type(char *x) { _datastore_type = x; }
6666

6767
/*
@@ -139,7 +139,7 @@ class SCLP23_NAME(PID_DA): public SCLP23_NAME(PID)
139139
#ifndef PART26
140140
virtual void oid (const SCLP23_NAME(DAObjectID) x) { _oid = x; }
141141
virtual SCLP23_NAME(DAObjectID) oid () const
142-
{ return (char*) _oid.chars(); }
142+
{ return const_cast<char *>(_oid.c_str()); }
143143
#else
144144
// virtual void oid (const SCLP26(DAObjectID) x, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException)
145145
virtual void oid (const DAObjectID x, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException)
@@ -188,7 +188,7 @@ class SCLP23_NAME(PID_SDAI) : public SCLP23_NAME(PID)
188188
//
189189
#ifndef PART26
190190
virtual void Modelid (const char * x) { _modelid = x; }
191-
virtual char * Modelid () const { return (char*) _modelid.chars(); }
191+
virtual char * Modelid () const { return const_cast<char *>(_modelid.c_str()); }
192192
#else
193193
virtual void Modelid (const char * x, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException)
194194
{ _modelid = x; }
@@ -297,7 +297,7 @@ class SCLP23_NAME(DAObject) : public SCLP23_NAME(sdaiObject)
297297
*/
298298
#ifndef PART26
299299
SCLP23_NAME(DAObjectID) dado_oid()
300-
{ return (char*) _dado_oid.chars(); }
300+
{ return const_cast<char *>(_dado_oid.c_str()); }
301301
#else
302302
// virtual SCLP26(DAObjectID) dado_oid (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException)
303303
virtual DAObjectID dado_oid (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException)

0 commit comments

Comments
 (0)