Merge branch 'perf_moses2' of github.com:hieuhoang/mosesdecoder into perf_moses2

moses/parameters/OptionsBaseClass.cpp

@@ -26,8 +26,8 @@ namespace Moses {
   }
 #else
   bool 
-  OptionsBaseClass::
   check(std::map<std::string, xmlrpc_c::value> const& param, 
+        std::string const key, bool dfltval)
   {}
 #endif
 }

moses/parameters/ReportingOptions.cpp

@@ -153,10 +153,5 @@ namespace Moses {
     
     return true;
   }
-#else
-  bool 
-  ReportingOptions::
-  update(std::map<std::string, xmlrpc_c::value>const& param)
-  {}
 #endif
 }