From 80f0f71d03b0348649835e674692938dc6862840 Mon Sep 17 00:00:00 2001
From: Hieu Hoang <hieuhoang@gmail.com>
Date: Wed, 17 Jun 2015 11:25:27 +0400
Subject: Revert "1st casualty of c++11. clang 2.6 (latest c++ compiler on osx)
 doesn't support list of object init"

This reverts commit 42c5424c86bc2f7f79b70821169dc24433e04b28.
---
 phrase-extract/ScoreFeatureTest.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'phrase-extract')

diff --git a/phrase-extract/ScoreFeatureTest.cpp b/phrase-extract/ScoreFeatureTest.cpp
index 93a452dad..51d4e1297 100644
--- a/phrase-extract/ScoreFeatureTest.cpp
+++ b/phrase-extract/ScoreFeatureTest.cpp
@@ -53,16 +53,16 @@ BOOST_AUTO_TEST_CASE(manager_configure_domain_except)
   //Check that configure rejects illegal domain arg combinations
   ScoreFeatureManager manager;
   BOOST_CHECK_THROW(
-    manager.configure(boost::assign::list_of("--DomainRatio")("/dev/null")("--DomainIndicator")("/dev/null")),
+    manager.configure( {"--DomainRatio","/dev/null","--DomainIndicator","/dev/null"}),
     ScoreFeatureArgumentException);
   BOOST_CHECK_THROW(
-    manager.configure(boost::assign::list_of("--SparseDomainSubset")("/dev/null")("--SparseDomainRatio")("/dev/null")),
+    manager.configure( {"--SparseDomainSubset","/dev/null","--SparseDomainRatio","/dev/null"}),
     ScoreFeatureArgumentException);
   BOOST_CHECK_THROW(
-    manager.configure(boost::assign::list_of("--SparseDomainBlah")("/dev/null")),
+    manager.configure( {"--SparseDomainBlah","/dev/null"}),
     ScoreFeatureArgumentException);
   BOOST_CHECK_THROW(
-    manager.configure(boost::assign::list_of("--DomainSubset")),
+    manager.configure( {"--DomainSubset"}),
     ScoreFeatureArgumentException);
 }
 
@@ -84,16 +84,16 @@ static void checkDomainConfigured(
 BOOST_AUTO_TEST_CASE(manager_config_domain)
 {
   checkDomainConfigured<RatioDomainFeature>
-  (boost::assign::list_of ("--DomainRatio")("/dev/null"));
+  ( {"--DomainRatio","/dev/null"});
   checkDomainConfigured<IndicatorDomainFeature>
-  (boost::assign::list_of("--DomainIndicator")("/dev/null"));
+  ( {"--DomainIndicator","/dev/null"});
   checkDomainConfigured<SubsetDomainFeature>
-  (boost::assign::list_of("--DomainSubset")("/dev/null"));
+  ( {"--DomainSubset","/dev/null"});
   checkDomainConfigured<SparseRatioDomainFeature>
-  (boost::assign::list_of("--SparseDomainRatio")("/dev/null"));
+  ( {"--SparseDomainRatio","/dev/null"});
   checkDomainConfigured<SparseIndicatorDomainFeature>
-  (boost::assign::list_of("--SparseDomainIndicator")("/dev/null"));
+  ( {"--SparseDomainIndicator","/dev/null"});
   checkDomainConfigured<SparseSubsetDomainFeature>
-  (boost::assign::list_of("--SparseDomainSubset")("/dev/null"));
+  ( {"--SparseDomainSubset","/dev/null"});
 }
 
-- 
cgit v1.2.3