From 0c3c057f83b1a132d3fa8c1f95e6ac15282febd6 Mon Sep 17 00:00:00 2001 From: PBerger Date: Sat, 30 May 2015 18:16:35 +0200 Subject: [PATCH] Fixed the usual "typename" errors in Clang-code. Former-commit-id: 20606ed360a00bdea82842927a0657b77f34f189 --- .../GmmxxHybridCtmcCslModelCheckerTest.cpp | 18 +++++++++++++++--- .../GmmxxHybridMdpPrctlModelCheckerTest.cpp | 14 +++++++++++--- .../NativeHybridCtmcCslModelCheckerTest.cpp | 18 +++++++++++++++--- .../NativeHybridDtmcPrctlModelCheckerTest.cpp | 12 ++++++++++-- .../NativeHybridMdpPrctlModelCheckerTest.cpp | 12 ++++++++++-- 5 files changed, 61 insertions(+), 13 deletions(-) diff --git a/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp index 522e61691..968a9476b 100644 --- a/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp +++ b/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp @@ -25,7 +25,11 @@ TEST(GmmxxHybridCtmcCslModelCheckerTest, Cluster) { std::shared_ptr formula(nullptr); // Build the model. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "num_repairs"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); @@ -110,7 +114,11 @@ TEST(GmmxxHybridCtmcCslModelCheckerTest, Embedded) { std::shared_ptr formula(nullptr); // Build the model. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "up"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); @@ -212,7 +220,11 @@ TEST(GmmxxHybridCtmcCslModelCheckerTest, Tandem) { std::shared_ptr formula(nullptr); // Build the model with the customers reward structure. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "customers"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); diff --git a/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp index 3a7cd5402..44de993a1 100644 --- a/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp @@ -16,7 +16,11 @@ TEST(GmmxxHybridMdpPrctlModelCheckerTest, Dice) { storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/two_dice.nm"); // Build the die model with its reward model. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "coinflips"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); @@ -113,8 +117,12 @@ TEST(GmmxxHybridMdpPrctlModelCheckerTest, Dice) { TEST(GmmxxHybridMdpPrctlModelCheckerTest, AsynchronousLeader) { storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/leader4.nm"); - // Build the die model with its reward model. - typename storm::builder::DdPrismModelBuilder::Options options; + // Build the die model with its reward model. +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "rounds"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); diff --git a/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp b/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp index ab90e8960..169289035 100644 --- a/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp +++ b/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp @@ -25,7 +25,11 @@ TEST(NativeHybridCtmcCslModelCheckerTest, Cluster) { std::shared_ptr formula(nullptr); // Build the model. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "num_repairs"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); @@ -110,7 +114,11 @@ TEST(NativeHybridCtmcCslModelCheckerTest, Embedded) { std::shared_ptr formula(nullptr); // Build the model. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "up"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); @@ -212,7 +220,11 @@ TEST(NativeHybridCtmcCslModelCheckerTest, Tandem) { std::shared_ptr formula(nullptr); // Build the model with the customers reward structure. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "customers"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); diff --git a/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp index 8cd46bcb1..60f283cd2 100644 --- a/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp @@ -16,7 +16,11 @@ TEST(NativeHybridDtmcPrctlModelCheckerTest, Die) { storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die.pm"); // Build the die model with its reward model. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "coin_flips"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); @@ -118,7 +122,11 @@ TEST(NativeHybridDtmcPrctlModelCheckerTest, SynchronousLeader) { storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/leader-3-5.pm"); // Build the die model with its reward model. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "num_rounds"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); diff --git a/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp index 1b1af244d..b16504b7f 100644 --- a/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp @@ -16,7 +16,11 @@ TEST(NativeHybridMdpPrctlModelCheckerTest, Dice) { storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/two_dice.nm"); // Build the die model with its reward model. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "coinflips"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options); @@ -114,7 +118,11 @@ TEST(NativeHybridMdpPrctlModelCheckerTest, AsynchronousLeader) { storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/leader4.nm"); // Build the die model with its reward model. - typename storm::builder::DdPrismModelBuilder::Options options; +#ifdef WINDOWS + storm::builder::DdPrismModelBuilder::Options options; +#else + typename storm::builder::DdPrismModelBuilder::Options options; +#endif options.buildRewards = true; options.rewardModelName = "rounds"; std::shared_ptr> model = storm::builder::DdPrismModelBuilder::translateProgram(program, options);