Score::Clone() via CRTP

git-svn-id: https://ws10smt.googlecode.com/svn/trunk@360 ec762483-ff6d-05da-a07a-a48fb63a330f

1 files changed, 9 insertions, 5 deletions

diff --git a/decoder/cdec.cc b/decoder/cdec.cc
index cc0b1434..6fb6d5a1 100644
--- a/decoder/cdec.cc
+++ b/decoder/cdec.cc
@@ -154,7 +154,7 @@ void InitCommandLine(int argc, char** argv, OracleBleu &ob, po::variables_map* c
   ob.AddOptions(&opts);
   po::options_description clo("Command line options");
   clo.add_options()
-        ("config,c", po::value<string>(), "Configuration file")
+    ("config,c", po::value<vector<string> >(), "Configuration file(s) - latest has priority")
         ("help,h", "Print this help message and exit")
     ("usage,u", po::value<string>(), "Describe a feature function type")
     ("compgen", "Print just option names suitable for bash command line completion builtin 'compgen'")
@@ -172,10 +172,14 @@ void InitCommandLine(int argc, char** argv, OracleBleu &ob, po::variables_map* c
   }
   ShowBanner();
   if (conf.count("config")) {
-    const string cfg = str("config",conf);
-    cerr << "Configuration file: " << cfg << endl;
-    ifstream config(cfg.c_str());
-    po::store(po::parse_config_file(config, dconfig_options), conf);
+    typedef vector<string> Cs;
+    Cs cs=conf["config"].as<Cs>();
+    for (int i=0;i<cs.size();++i) {
+      string cfg=cs[i];
+      cerr << "Configuration file: " << cfg << endl;
+      ifstream config(cfg.c_str());
+      po::store(po::parse_config_file(config, dconfig_options), conf);
+    }
   }
   po::notify(conf);