Skip to content

Commit 85a4841

Browse files
tom-hg57tom-hg57
committed
Prevent cutting of string values at first space in assign methods (update generated sources from https://github.com/tom-hg57/cimgen/tree/fix-generation-of-string-classes-for-cpp).
Signed-off-by: Thomas Günther <[email protected]>
1 parent e10ad4e commit 85a4841

38 files changed

+175
-175
lines changed

‎CGMES_2.4.13_18DEC2013/BasicIntervalSchedule.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bool assign_BasicIntervalSchedule_startTime(std::stringstream &buffer, BaseClass
2020
{
2121
if (BasicIntervalSchedule* element = dynamic_cast<BasicIntervalSchedule*>(BaseClass_ptr1))
2222
{
23-
buffer >> element->startTime;
23+
element->startTime = buffer.str();
2424
if (buffer.fail())
2525
return false;
2626
else

‎CGMES_2.4.13_18DEC2013/ConnectivityNode.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ bool assign_ConnectivityNode_fromEndIsoCode(std::stringstream &buffer, BaseClass
4343
{
4444
if (ConnectivityNode* element = dynamic_cast<ConnectivityNode*>(BaseClass_ptr1))
4545
{
46-
buffer >> element->fromEndIsoCode;
46+
element->fromEndIsoCode = buffer.str();
4747
if (buffer.fail())
4848
return false;
4949
else
@@ -56,7 +56,7 @@ bool assign_ConnectivityNode_fromEndName(std::stringstream &buffer, BaseClass* B
5656
{
5757
if (ConnectivityNode* element = dynamic_cast<ConnectivityNode*>(BaseClass_ptr1))
5858
{
59-
buffer >> element->fromEndName;
59+
element->fromEndName = buffer.str();
6060
if (buffer.fail())
6161
return false;
6262
else
@@ -69,7 +69,7 @@ bool assign_ConnectivityNode_fromEndNameTso(std::stringstream &buffer, BaseClass
6969
{
7070
if (ConnectivityNode* element = dynamic_cast<ConnectivityNode*>(BaseClass_ptr1))
7171
{
72-
buffer >> element->fromEndNameTso;
72+
element->fromEndNameTso = buffer.str();
7373
if (buffer.fail())
7474
return false;
7575
else
@@ -82,7 +82,7 @@ bool assign_ConnectivityNode_toEndIsoCode(std::stringstream &buffer, BaseClass*
8282
{
8383
if (ConnectivityNode* element = dynamic_cast<ConnectivityNode*>(BaseClass_ptr1))
8484
{
85-
buffer >> element->toEndIsoCode;
85+
element->toEndIsoCode = buffer.str();
8686
if (buffer.fail())
8787
return false;
8888
else
@@ -95,7 +95,7 @@ bool assign_ConnectivityNode_toEndName(std::stringstream &buffer, BaseClass* Bas
9595
{
9696
if (ConnectivityNode* element = dynamic_cast<ConnectivityNode*>(BaseClass_ptr1))
9797
{
98-
buffer >> element->toEndName;
98+
element->toEndName = buffer.str();
9999
if (buffer.fail())
100100
return false;
101101
else
@@ -108,7 +108,7 @@ bool assign_ConnectivityNode_toEndNameTso(std::stringstream &buffer, BaseClass*
108108
{
109109
if (ConnectivityNode* element = dynamic_cast<ConnectivityNode*>(BaseClass_ptr1))
110110
{
111-
buffer >> element->toEndNameTso;
111+
element->toEndNameTso = buffer.str();
112112
if (buffer.fail())
113113
return false;
114114
else

‎CGMES_2.4.13_18DEC2013/Control.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ bool assign_Control_controlType(std::stringstream &buffer, BaseClass* BaseClass_
2424
{
2525
if (Control* element = dynamic_cast<Control*>(BaseClass_ptr1))
2626
{
27-
buffer >> element->controlType;
27+
element->controlType = buffer.str();
2828
if (buffer.fail())
2929
return false;
3030
else
@@ -50,7 +50,7 @@ bool assign_Control_timeStamp(std::stringstream &buffer, BaseClass* BaseClass_pt
5050
{
5151
if (Control* element = dynamic_cast<Control*>(BaseClass_ptr1))
5252
{
53-
buffer >> element->timeStamp;
53+
element->timeStamp = buffer.str();
5454
if (buffer.fail())
5555
return false;
5656
else

‎CGMES_2.4.13_18DEC2013/CoordinateSystem.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bool assign_CoordinateSystem_crsUrn(std::stringstream &buffer, BaseClass* BaseCl
2020
{
2121
if (CoordinateSystem* element = dynamic_cast<CoordinateSystem*>(BaseClass_ptr1))
2222
{
23-
buffer >> element->crsUrn;
23+
element->crsUrn = buffer.str();
2424
if (buffer.fail())
2525
return false;
2626
else

‎CGMES_2.4.13_18DEC2013/DiagramLayoutVersion.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bool assign_DiagramLayoutVersion_baseUML(std::stringstream &buffer, BaseClass* B
2727
{
2828
if (DiagramLayoutVersion* element = dynamic_cast<DiagramLayoutVersion*>(BaseClass_ptr1))
2929
{
30-
buffer >> element->baseUML;
30+
element->baseUML = buffer.str();
3131
if (buffer.fail())
3232
return false;
3333
else
@@ -40,7 +40,7 @@ bool assign_DiagramLayoutVersion_baseURI(std::stringstream &buffer, BaseClass* B
4040
{
4141
if (DiagramLayoutVersion* element = dynamic_cast<DiagramLayoutVersion*>(BaseClass_ptr1))
4242
{
43-
buffer >> element->baseURI;
43+
element->baseURI = buffer.str();
4444
if (buffer.fail())
4545
return false;
4646
else
@@ -53,7 +53,7 @@ bool assign_DiagramLayoutVersion_date(std::stringstream &buffer, BaseClass* Base
5353
{
5454
if (DiagramLayoutVersion* element = dynamic_cast<DiagramLayoutVersion*>(BaseClass_ptr1))
5555
{
56-
buffer >> element->date;
56+
element->date = buffer.str();
5757
if (buffer.fail())
5858
return false;
5959
else
@@ -66,7 +66,7 @@ bool assign_DiagramLayoutVersion_differenceModelURI(std::stringstream &buffer, B
6666
{
6767
if (DiagramLayoutVersion* element = dynamic_cast<DiagramLayoutVersion*>(BaseClass_ptr1))
6868
{
69-
buffer >> element->differenceModelURI;
69+
element->differenceModelURI = buffer.str();
7070
if (buffer.fail())
7171
return false;
7272
else
@@ -79,7 +79,7 @@ bool assign_DiagramLayoutVersion_entsoeUML(std::stringstream &buffer, BaseClass*
7979
{
8080
if (DiagramLayoutVersion* element = dynamic_cast<DiagramLayoutVersion*>(BaseClass_ptr1))
8181
{
82-
buffer >> element->entsoeUML;
82+
element->entsoeUML = buffer.str();
8383
if (buffer.fail())
8484
return false;
8585
else
@@ -92,7 +92,7 @@ bool assign_DiagramLayoutVersion_entsoeURI(std::stringstream &buffer, BaseClass*
9292
{
9393
if (DiagramLayoutVersion* element = dynamic_cast<DiagramLayoutVersion*>(BaseClass_ptr1))
9494
{
95-
buffer >> element->entsoeURI;
95+
element->entsoeURI = buffer.str();
9696
if (buffer.fail())
9797
return false;
9898
else
@@ -105,7 +105,7 @@ bool assign_DiagramLayoutVersion_modelDescriptionURI(std::stringstream &buffer,
105105
{
106106
if (DiagramLayoutVersion* element = dynamic_cast<DiagramLayoutVersion*>(BaseClass_ptr1))
107107
{
108-
buffer >> element->modelDescriptionURI;
108+
element->modelDescriptionURI = buffer.str();
109109
if (buffer.fail())
110110
return false;
111111
else
@@ -118,7 +118,7 @@ bool assign_DiagramLayoutVersion_namespaceRDF(std::stringstream &buffer, BaseCla
118118
{
119119
if (DiagramLayoutVersion* element = dynamic_cast<DiagramLayoutVersion*>(BaseClass_ptr1))
120120
{
121-
buffer >> element->namespaceRDF;
121+
element->namespaceRDF = buffer.str();
122122
if (buffer.fail())
123123
return false;
124124
else
@@ -131,7 +131,7 @@ bool assign_DiagramLayoutVersion_namespaceUML(std::stringstream &buffer, BaseCla
131131
{
132132
if (DiagramLayoutVersion* element = dynamic_cast<DiagramLayoutVersion*>(BaseClass_ptr1))
133133
{
134-
buffer >> element->namespaceUML;
134+
element->namespaceUML = buffer.str();
135135
if (buffer.fail())
136136
return false;
137137
else
@@ -144,7 +144,7 @@ bool assign_DiagramLayoutVersion_shortName(std::stringstream &buffer, BaseClass*
144144
{
145145
if (DiagramLayoutVersion* element = dynamic_cast<DiagramLayoutVersion*>(BaseClass_ptr1))
146146
{
147-
buffer >> element->shortName;
147+
element->shortName = buffer.str();
148148
if (buffer.fail())
149149
return false;
150150
else

‎CGMES_2.4.13_18DEC2013/DynamicsVersion.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bool assign_DynamicsVersion_baseUML(std::stringstream &buffer, BaseClass* BaseCl
2727
{
2828
if (DynamicsVersion* element = dynamic_cast<DynamicsVersion*>(BaseClass_ptr1))
2929
{
30-
buffer >> element->baseUML;
30+
element->baseUML = buffer.str();
3131
if (buffer.fail())
3232
return false;
3333
else
@@ -40,7 +40,7 @@ bool assign_DynamicsVersion_baseURI(std::stringstream &buffer, BaseClass* BaseCl
4040
{
4141
if (DynamicsVersion* element = dynamic_cast<DynamicsVersion*>(BaseClass_ptr1))
4242
{
43-
buffer >> element->baseURI;
43+
element->baseURI = buffer.str();
4444
if (buffer.fail())
4545
return false;
4646
else
@@ -53,7 +53,7 @@ bool assign_DynamicsVersion_date(std::stringstream &buffer, BaseClass* BaseClass
5353
{
5454
if (DynamicsVersion* element = dynamic_cast<DynamicsVersion*>(BaseClass_ptr1))
5555
{
56-
buffer >> element->date;
56+
element->date = buffer.str();
5757
if (buffer.fail())
5858
return false;
5959
else
@@ -66,7 +66,7 @@ bool assign_DynamicsVersion_differenceModelURI(std::stringstream &buffer, BaseCl
6666
{
6767
if (DynamicsVersion* element = dynamic_cast<DynamicsVersion*>(BaseClass_ptr1))
6868
{
69-
buffer >> element->differenceModelURI;
69+
element->differenceModelURI = buffer.str();
7070
if (buffer.fail())
7171
return false;
7272
else
@@ -79,7 +79,7 @@ bool assign_DynamicsVersion_entsoeUML(std::stringstream &buffer, BaseClass* Base
7979
{
8080
if (DynamicsVersion* element = dynamic_cast<DynamicsVersion*>(BaseClass_ptr1))
8181
{
82-
buffer >> element->entsoeUML;
82+
element->entsoeUML = buffer.str();
8383
if (buffer.fail())
8484
return false;
8585
else
@@ -92,7 +92,7 @@ bool assign_DynamicsVersion_entsoeURI(std::stringstream &buffer, BaseClass* Base
9292
{
9393
if (DynamicsVersion* element = dynamic_cast<DynamicsVersion*>(BaseClass_ptr1))
9494
{
95-
buffer >> element->entsoeURI;
95+
element->entsoeURI = buffer.str();
9696
if (buffer.fail())
9797
return false;
9898
else
@@ -105,7 +105,7 @@ bool assign_DynamicsVersion_modelDescriptionURI(std::stringstream &buffer, BaseC
105105
{
106106
if (DynamicsVersion* element = dynamic_cast<DynamicsVersion*>(BaseClass_ptr1))
107107
{
108-
buffer >> element->modelDescriptionURI;
108+
element->modelDescriptionURI = buffer.str();
109109
if (buffer.fail())
110110
return false;
111111
else
@@ -118,7 +118,7 @@ bool assign_DynamicsVersion_namespaceRDF(std::stringstream &buffer, BaseClass* B
118118
{
119119
if (DynamicsVersion* element = dynamic_cast<DynamicsVersion*>(BaseClass_ptr1))
120120
{
121-
buffer >> element->namespaceRDF;
121+
element->namespaceRDF = buffer.str();
122122
if (buffer.fail())
123123
return false;
124124
else
@@ -131,7 +131,7 @@ bool assign_DynamicsVersion_namespaceUML(std::stringstream &buffer, BaseClass* B
131131
{
132132
if (DynamicsVersion* element = dynamic_cast<DynamicsVersion*>(BaseClass_ptr1))
133133
{
134-
buffer >> element->namespaceUML;
134+
element->namespaceUML = buffer.str();
135135
if (buffer.fail())
136136
return false;
137137
else
@@ -144,7 +144,7 @@ bool assign_DynamicsVersion_shortName(std::stringstream &buffer, BaseClass* Base
144144
{
145145
if (DynamicsVersion* element = dynamic_cast<DynamicsVersion*>(BaseClass_ptr1))
146146
{
147-
buffer >> element->shortName;
147+
element->shortName = buffer.str();
148148
if (buffer.fail())
149149
return false;
150150
else

‎CGMES_2.4.13_18DEC2013/EquipmentBoundaryVersion.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bool assign_EquipmentBoundaryVersion_baseUML(std::stringstream &buffer, BaseClas
2828
{
2929
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
3030
{
31-
buffer >> element->baseUML;
31+
element->baseUML = buffer.str();
3232
if (buffer.fail())
3333
return false;
3434
else
@@ -41,7 +41,7 @@ bool assign_EquipmentBoundaryVersion_baseURI(std::stringstream &buffer, BaseClas
4141
{
4242
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
4343
{
44-
buffer >> element->baseURI;
44+
element->baseURI = buffer.str();
4545
if (buffer.fail())
4646
return false;
4747
else
@@ -54,7 +54,7 @@ bool assign_EquipmentBoundaryVersion_date(std::stringstream &buffer, BaseClass*
5454
{
5555
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
5656
{
57-
buffer >> element->date;
57+
element->date = buffer.str();
5858
if (buffer.fail())
5959
return false;
6060
else
@@ -67,7 +67,7 @@ bool assign_EquipmentBoundaryVersion_differenceModelURI(std::stringstream &buffe
6767
{
6868
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
6969
{
70-
buffer >> element->differenceModelURI;
70+
element->differenceModelURI = buffer.str();
7171
if (buffer.fail())
7272
return false;
7373
else
@@ -80,7 +80,7 @@ bool assign_EquipmentBoundaryVersion_entsoeUML(std::stringstream &buffer, BaseCl
8080
{
8181
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
8282
{
83-
buffer >> element->entsoeUML;
83+
element->entsoeUML = buffer.str();
8484
if (buffer.fail())
8585
return false;
8686
else
@@ -93,7 +93,7 @@ bool assign_EquipmentBoundaryVersion_entsoeURIcore(std::stringstream &buffer, Ba
9393
{
9494
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
9595
{
96-
buffer >> element->entsoeURIcore;
96+
element->entsoeURIcore = buffer.str();
9797
if (buffer.fail())
9898
return false;
9999
else
@@ -106,7 +106,7 @@ bool assign_EquipmentBoundaryVersion_entsoeURIoperation(std::stringstream &buffe
106106
{
107107
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
108108
{
109-
buffer >> element->entsoeURIoperation;
109+
element->entsoeURIoperation = buffer.str();
110110
if (buffer.fail())
111111
return false;
112112
else
@@ -119,7 +119,7 @@ bool assign_EquipmentBoundaryVersion_modelDescriptionURI(std::stringstream &buff
119119
{
120120
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
121121
{
122-
buffer >> element->modelDescriptionURI;
122+
element->modelDescriptionURI = buffer.str();
123123
if (buffer.fail())
124124
return false;
125125
else
@@ -132,7 +132,7 @@ bool assign_EquipmentBoundaryVersion_namespaceRDF(std::stringstream &buffer, Bas
132132
{
133133
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
134134
{
135-
buffer >> element->namespaceRDF;
135+
element->namespaceRDF = buffer.str();
136136
if (buffer.fail())
137137
return false;
138138
else
@@ -145,7 +145,7 @@ bool assign_EquipmentBoundaryVersion_namespaceUML(std::stringstream &buffer, Bas
145145
{
146146
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
147147
{
148-
buffer >> element->namespaceUML;
148+
element->namespaceUML = buffer.str();
149149
if (buffer.fail())
150150
return false;
151151
else
@@ -158,7 +158,7 @@ bool assign_EquipmentBoundaryVersion_shortName(std::stringstream &buffer, BaseCl
158158
{
159159
if (EquipmentBoundaryVersion* element = dynamic_cast<EquipmentBoundaryVersion*>(BaseClass_ptr1))
160160
{
161-
buffer >> element->shortName;
161+
element->shortName = buffer.str();
162162
if (buffer.fail())
163163
return false;
164164
else

0 commit comments

Comments
 (0)