Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 163842 Details for
Bug 155974
[science overlay] sci-misc/salome-* (New packages)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for SUPERV component to use omniORB 4.1.x
salome-superv-3.2.6_omniorb_4.1.patch (text/plain), 7.62 KB, created by
François DORIN
on 2008-08-26 18:39:56 UTC
(
hide
)
Description:
patch for SUPERV component to use omniORB 4.1.x
Filename:
MIME Type:
Creator:
François DORIN
Created:
2008-08-26 18:39:56 UTC
Size:
7.62 KB
patch
obsolete
>diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx >--- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx 2008-08-22 19:55:15.000000000 +0200 >+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx 2008-08-22 19:57:13.000000000 +0200 >@@ -74,7 +74,7 @@ > ostream & GraphBase::Base::AnyValue( const CORBA::Any & anAny ) { > switch (anAny.type()->kind()) { > case CORBA::tk_string: { >- char * t; >+ const char * t; > anAny >>= t; > *_fdebug << " " << t << " (tk_string)" << endl ; > break; >diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx >--- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx 2008-08-22 19:55:15.000000000 +0200 >+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx 2008-08-22 21:55:22.000000000 +0200 >@@ -151,7 +151,7 @@ > #endif > switch (aDataValue->type()->kind()) { // Input Value > case CORBA::tk_string: { // Input string Value >- char * t; >+ const char * t; > *aDataValue >>= t; > #if ValueTrace > cdebug << t << " (string)" ; >@@ -242,7 +242,7 @@ > char t[40] ; > sprintf( t , "%ld" , ll ) ; > *theValue <<= t ; >- char *tt ; >+ const char *tt ; > *theValue >>= tt ; > #if ValueTrace > cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ; >@@ -311,7 +311,7 @@ > char t[40] ; > sprintf( t , "%lf" , d ) ; > *theValue <<= t ; >- char *tt ; >+ const char *tt ; > *theValue >>= tt ; > #if ValueTrace > cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ; >@@ -473,7 +473,7 @@ > //JR 30.03.2005 switch ( theValue->type()->kind() ) { > switch ( theValue.type()->kind() ) { > case CORBA::tk_string: { >- char * t; >+ const char * t; > //JR 30.03.2005 *theValue >>= t; > theValue >>= t; > // cdebug << "GraphBase::DataPort::Value() : " << t << " (string) " << endl ; >@@ -583,7 +583,7 @@ > const CORBA::Any * theValue = *_Value ; > switch (theValue->type()->kind()) { > case CORBA::tk_string: >- char * t; >+ const char * t; > *theValue >>= t; > f << t << " (string)" ; > break; >diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx >--- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx 2008-08-22 19:55:15.000000000 +0200 >+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx 2008-08-22 22:29:22.000000000 +0200 >@@ -1598,7 +1598,7 @@ > bool isUnknown = false; > switch (aValue.type()->kind()) { > case CORBA::tk_string: >- char * t; >+ const char * t; > aValue >>= t; > cdebug << t << " (string) " ; > if ( !strcmp( t, "Unknown CORBA::Any Type" ) ) >@@ -1688,7 +1688,7 @@ > << ToServiceParameterName << "' , Any " ; > switch (aValue.type()->kind()) { > case CORBA::tk_string: >- char * t; >+ const char * t; > aValue >>= t; > cdebug << t << " (string) " ; > break; >diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx >--- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx 2008-08-22 19:55:15.000000000 +0200 >+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx 2008-08-22 22:00:15.000000000 +0200 >@@ -718,7 +718,7 @@ > case CORBA::tk_string: { > //Mandrake 10.1/Salome 3 aLink.aLinkValue <<= (char *) NULL ; > aLink.aLinkValue <<= (char *) "" ; >- char * t; >+ const char * t; > aLink.aLinkValue >>= t; > #if TRACE > MESSAGE( t << " (string)" ); >@@ -778,7 +778,7 @@ > switch ( aLink.aLinkValue.type()->kind() ) { > case CORBA::tk_string: { > aLink.aLinkValue <<= fieldvalue[depth].c_str() ; >- char * t; >+ const char * t; > aLink.aLinkValue >>= t; > #if TRACE > MESSAGE( t << " (string)" ); >diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx >--- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx 2008-08-22 19:55:15.000000000 +0200 >+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx 2008-08-22 22:44:27.000000000 +0200 >@@ -1200,7 +1200,7 @@ > valuetype.appendChild( aField ) ; > switch (aLink.aLinkValue.type()->kind()) { > case CORBA::tk_string: { >- char* retstr ; >+ const char* retstr ; > aLink.aLinkValue >>= retstr; > // f << Tabs << " <value>" << retstr << "</value>" << endl ; > QDomElement value = Graph.createElement( "value" ) ; >@@ -1345,7 +1345,7 @@ > << ".Input( " ; > switch (aLink.aLinkValue.type()->kind()) { > case CORBA::tk_string: { >- char* retstr ; >+ const char* retstr ; > aLink.aLinkValue >>= retstr; > f << "'" << retstr << "'" ; > break ; >diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx >--- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx 2008-08-22 19:55:15.000000000 +0200 >+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx 2008-08-22 22:59:18.000000000 +0200 >@@ -3277,7 +3277,7 @@ > const char * Type = anInPort->GetServicesParameter().Parametertype ; > switch ( D.Value.type()->kind() ) { // { string , long , double , objref } > case CORBA::tk_string: >- char * t; >+ const char * t; > D.Value >>= t; > #if InParametersSetTrace > cdebug << t << " (string)" ; >@@ -3675,7 +3675,7 @@ > #if InParametersSetTrace > switch (D.Value.type()->kind()) { // { string , long , double , objref } > case CORBA::tk_string: >- char * t; >+ const char * t; > D.Value >>= t; > cdebug << ThreadNo() << " " << t << "(string)" << endl ; > break; >@@ -3764,7 +3764,7 @@ > ServicesAnyData D = OutParametersList[i] ; > switch (D.Value.type()->kind()) { // { string , long , double , objref } > case CORBA::tk_string: { >- char * t; >+ const char * t; > D.Value >>= t; > #if OutParametersSetTrace > cdebug << ThreadNo() << " " << t << "(string)" << endl ; >@@ -3999,7 +3999,7 @@ > #if OutParametersSetTrace > switch ( anOutPort->Value().type()->kind() ) { > case CORBA::tk_string: >- char * t; >+ const char * t; > (anOutPort->Value()) >>= t; > cdebug << ThreadNo() << " Out" << i << " : " << t << "(string)" << endl ; > break; >diff -abur src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx src3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx >--- src3.2.6_orig/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx 2008-08-22 19:55:15.000000000 +0200 >+++ src3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx 2008-08-22 22:48:17.000000000 +0200 >@@ -320,7 +320,7 @@ > sname = InParametersList[i].Name.c_str() ; > switch ( data.type()->kind() ) { > case CORBA::tk_string : { >- char * t ; >+ const char * t ; > data >>= t ; > PyObject * ArgValue = Py_BuildValue( "s" , t ) ; > PyTuple_SetItem( ArgsList , i , ArgValue ) ;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 155974
:
102571
|
102572
|
102573
|
114639
|
114650
|
114651
|
114653
|
114655
|
114657
|
114659
|
114660
|
114662
|
114664
|
120027
|
120226
|
131980
|
131981
|
131983
|
137331
|
137336
|
137338
|
137719
|
138048
|
138578
|
138580
|
138581
|
138582
|
138583
|
138584
|
138586
|
138588
|
138877
|
138896
|
138925
|
138960
|
139043
|
139045
|
139956
|
139958
|
139964
|
139965
|
139973
|
140002
|
140005
|
140007
|
140030
|
140032
|
140064
|
140066
|
140068
|
140071
|
140073
|
140086
|
140088
|
140280
|
140283
|
140301
|
140303
|
140366
|
140368
|
140373
|
140375
|
140378
|
140385
|
140386
|
140455
|
140466
|
140468
|
140472
|
140474
|
140637
|
141242
|
141243
|
141250
|
141252
|
141254
|
141256
|
141257
|
141462
|
141473
|
141474
|
141475
|
141565
|
141572
|
142892
|
142894
|
142905
|
143984
|
143986
|
144011
|
144061
|
144063
|
144084
|
144086
|
144089
|
144091
|
144093
|
144098
|
144105
|
144107
|
144117
|
144119
|
144182
|
144184
|
144185
|
144187
|
144188
|
144198
|
144223
|
144305
|
144306
|
144308
|
144310
|
144311
|
144313
|
144314
|
144316
|
144318
|
144320
|
144347
|
144348
|
144350
|
144352
|
144353
|
144354
|
144356
|
144357
|
144557
|
145883
|
145885
|
145887
|
146138
|
146414
|
147142
|
147146
|
148604
|
148606
|
148607
|
148609
|
148611
|
148613
|
148615
|
148617
|
148618
|
148619
|
150326
|
151031
|
151032
|
151034
|
151036
|
151038
|
151039
|
151040
|
151042
|
151044
|
151045
|
152339
|
152341
|
152343
|
152345
|
152347
|
152349
|
152351
|
152353
|
152355
|
152357
|
152359
|
152361
|
152363
|
152365
|
152369
|
152371
|
152979
|
153067
|
154323
|
154325
|
154327
|
154329
|
154331
|
154333
|
154335
|
158563
|
161347
|
163275
|
163841
| 163842 |
164412
|
164611
|
168552
|
168560
|
168624
|
168626
|
168724
|
168726
|
168734
|
168736
|
178432
|
178434
|
178739
|
179160
|
179161
|
179162
|
179237
|
179627
|
179628
|
183321
|
183323
|
183324
|
183325
|
183327
|
183329
|
183347
|
183348
|
189058
|
189059
|
189061
|
200799
|
200800
|
200802
|
200803
|
200805
|
200807
|
200809
|
200811
|
200812
|
200813
|
200815
|
200816
|
200818
|
200820
|
200821
|
200823
|
200825
|
204604
|
204699
|
204980
|
205339
|
223869
|
223871
|
232539
|
234261
|
253803
|
253805
|
254743
|
254751
|
254755
|
257260
|
257261
|
268839
|
268883
|
278009
|
286253
|
286255
|
286257
|
286259
|
286261
|
286263
|
286265
|
286267
|
286269
|
286271
|
286273
|
323878