Context Navigation

← Previous Change
Next Change →

Changeset 25836 for issm/trunk/src/c/classes/Params/Param.h

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

Files:

: 4 edited

. (modified) (1 prop)
src (modified) (1 prop)
src/c (modified) (1 prop)
src/c/classes/Params/Param.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:mergeinfo changed

/issm/trunk-jpl

merged: 24687-24689,24691-25328,25330-25332,25334,25336-25346,25354-25357,25362-25478,25481-25493,25497-25525,25528-25533,25536,25539-25565,25567-25586,25590-25594,25597-25598,25608-25612,25616-25617,25619-25624,25626-25723,25725-25738,25741,25744-25775,25777-25829,25832-25833

issm/trunk/src

Property svn:mergeinfo changed

/issm/branches/trunk-larour-SLPS2020/src (added)	merged: 25333,25335,25347-25353,25358-25361,25479-25480,25494-25496,25534-25535,25537-25538,25566,25587-25589,25596,25599-25603,25605,25613-25615,25618,25625
/issm/trunk-jpl/src	merged: 24687,24689,24691,24705,24708-24716,24718-24719,24727-24731,24733-24736,24738,24740-24747,24750-24754,24756,24759-24762,24765-24772,24774,24776-24780,24784,24786,24788-24794,24796-24800,24802-24808,24816-24820,24822-24823,24830,24835-24837,24839,24841,24843-24855,24857-24861,24865-24870,24873-24875,24878-24889,24892,24894-24904,24910,24915-24921,24924,24926,24933-24936,24938-24947,24949-24951,24956-24957,24959-24960,24963-24964,24968-24969,24972-24974,24976-24991,24994,24998-25004,25006,25010-25015,25018-25028,25030-25039,25041,25044-25045,25047,25050-25066,25068-25069,25072,25074,25076,25078-25088,25090-25101,25105,25109-25110,25116-25120,25122-25123,25125,25128-25130,25132,25136-25139,25141-25146,25148-25158,25160-25172,25183,25185,25189-25193,25195-25196,25198,25201,25206-25215,25218-25223,25225,25227-25233,25235-25237,25239-25242,25244-25253,25255-25267,25269-25270,25272-25279,25281-25289,25292-25297,25300-25301,25303-25308,25310-25328,25330,25332,25334,25336-25341,25343-25344,25346,25354,25357,25362-25366,25368-25369,25373-25374,25377-25396,25400-25408,25411-25415,25417-25427,25430,25435-25460,25463-25469,25471-25474,25476-25478,25481,25483-25492,25497,25499-25503,25505-25516,25519-25525,25528-25533,25536,25539-25541,25543,25549-25551,25554-25564,25571,25574-25576,25578,25580-25586,25590-25594,25597-25598,25608-25611,25619-25623,25626-25634,25636-25639,25642-25645,25647,25649,25652,25655,25658,25661-25664,25666,25668-25669,25675,25677-25686,25688,25691,25694-25698,25703,25710-25712,25714-25715,25717-25718,25720-25723,25725-25728,25733-25738,25741,25747,25750-25759,25761-25764,25766-25767,25770-25775,25777-25780,25784,25786,25792-25794,25797-25798,25806-25807,25810-25814,25816-25819,25826-25829,25833

issm/trunk/src/c

Property svn:ignore

old	new
23	23	issm_ocean
24	24	issm_dakota
	25	issm_post

issm/trunk/src/c/classes/Params/Param.h

r22758	r25836
45	45	virtual void GetParameterValue(DataSet** pdataset)=0;
46	46	virtual int InstanceEnum()=0;
47		virtual void ~~Marshall(char** pmarshalled_data, int* pmarshalled_data_size, int marshall_direction~~)=0;
	47	virtual void Marshall(MarshallHandle* marshallhandle)=0;
48	48	virtual int ObjectEnum()=0;
49	49

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: