From 6d9ed904ad16202486999bb075152f96d00744dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20=C4=8Cerven=C3=BD?= <radovan.cerveny@gmail.com>
Date: Wed, 16 Mar 2016 13:06:39 +0100
Subject: [PATCH] changed semantics behind required substitution pattern
---
.../src/provisioner/MeasurementProvisionerInputData.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/alib2measurepp/src/provisioner/MeasurementProvisionerInputData.cpp b/alib2measurepp/src/provisioner/MeasurementProvisionerInputData.cpp
index 639a690756..bbabef0cc6 100644
--- a/alib2measurepp/src/provisioner/MeasurementProvisionerInputData.cpp
+++ b/alib2measurepp/src/provisioner/MeasurementProvisionerInputData.cpp
@@ -153,10 +153,7 @@ void MPInputData::processMPCInputData ( const MeasurementProvisionerConfiguratio
for ( const MPCPipelineCommand & mpcpc : pipeline ) {
MPPipelineCommand mppc ( mpcpc.command, mpcpc.measure );
- if ( this->requiredSubstitutionPattern.size ( ) == 0 )
- this->requiredSubstitutionPattern = mppc.getSubstitutionPattern ( );
- else if ( mppc.getSubstitutionPattern ( ).size ( ) && ( this->requiredSubstitutionPattern != mppc.getSubstitutionPattern ( ) ) )
- throw::exception::CommonException ( "MPInputData: Substitution pattern is not consistent across commands" );
+ this->requiredSubstitutionPattern.insert ( mppc.getSubstitutionPattern ( ).begin ( ), mppc.getSubstitutionPattern ( ).end ( ) );
mpp.push_back ( std::move ( mppc ) );
}
--
GitLab