Passing around AllOptions or references thereto everywhere,

strong them locally where appropriate, so that compontents can
become independent of StaticData once instantiated.

2 files changed, 3 insertions, 3 deletions

diff --git a/moses-cmd/LatticeMBRGrid.cpp b/moses-cmd/LatticeMBRGrid.cpp
index 0fddaa82d..f1dfd5b26 100644
--- a/moses-cmd/LatticeMBRGrid.cpp
+++ b/moses-cmd/LatticeMBRGrid.cpp
@@ -167,7 +167,7 @@ int main(int argc, char const* argv[])
   MBR_Options&   mbr = SD.options().mbr;
   lmbr.enabled = true;
 
-  boost::shared_ptr<IOWrapper> ioWrapper(new IOWrapper);
+  boost::shared_ptr<IOWrapper> ioWrapper(new IOWrapper(SD.options()));
   if (!ioWrapper) {
     throw runtime_error("Failed to initialise IOWrapper");
   }
diff --git a/moses-cmd/MainVW.cpp b/moses-cmd/MainVW.cpp
index 94eee66d9..396a1c1d4 100644
--- a/moses-cmd/MainVW.cpp
+++ b/moses-cmd/MainVW.cpp
@@ -125,8 +125,8 @@ int main(int argc, char const** argv)
     IFVERBOSE(1) {
       PrintUserTime("Created input-output object");
     }
-
-    boost::shared_ptr<IOWrapper> ioWrapper(new IOWrapper());
+    AllOptions::ptr opts(new AllOptions(StaticData::Instance().options()));
+    boost::shared_ptr<IOWrapper> ioWrapper(new IOWrapper(*opts));
     if (ioWrapper == NULL) {
       cerr << "Error; Failed to create IO object" << endl;
       exit(1);