Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 5e4b2574 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Merge branch '15-build-failure-with-designated-initializers' into 'master'

Resolve "build failure with designated initializers"

Closes #15

See merge request !12
parents 297d71d2 34b57c89
No related branches found
No related tags found
1 merge request!12Resolve "build failure with designated initializers"
...@@ -328,17 +328,16 @@ OTF2_CallbackCode ParserDefinitionOTF2::handler_DefMetricMember( void* ...@@ -328,17 +328,16 @@ OTF2_CallbackCode ParserDefinitionOTF2::handler_DefMetricMember( void*
OTF2_Base base, OTF2_Base base,
int64_t exponent, int64_t exponent,
OTF2_StringRef unit ) { OTF2_StringRef unit ) {
OTF2_MetricMember temp = { OTF2_MetricMember temp;
._id =self, temp._id =self;
._name =name, temp._name =name;
._description=description, temp._description=description;
._metricType =metricType, temp._metricType =metricType;
._metricMode =metricMode, temp._metricMode =metricMode;
._valueType =valueType, temp._valueType =valueType;
._base =base, temp._base =base;
._exponent =exponent, temp._exponent =exponent;
._unit =unit temp._unit =unit;
};
ParserDefinitionOTF2::_metric_member[self] = temp; ParserDefinitionOTF2::_metric_member[self] = temp;
...@@ -352,11 +351,10 @@ OTF2_CallbackCode ParserDefinitionOTF2::handler_DefMetricClass( void* ...@@ -352,11 +351,10 @@ OTF2_CallbackCode ParserDefinitionOTF2::handler_DefMetricClass( void*
OTF2_MetricOccurrence metricOccurrence, OTF2_MetricOccurrence metricOccurrence,
OTF2_RecorderKind recorderKind ) { OTF2_RecorderKind recorderKind ) {
OTF2_MetricClass temp = { OTF2_MetricClass temp;
._id = self, temp._id = self;
._metricOccurrence = metricOccurrence, temp._metricOccurrence = metricOccurrence;
._recorderKind = recorderKind, temp._recorderKind = recorderKind;
};
for(int i=0; i<numberOfMetrics; i++) { for(int i=0; i<numberOfMetrics; i++) {
temp._metricMembers.push_back(metricMembers[i]); temp._metricMembers.push_back(metricMembers[i]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment