remove all Moses headers

contrib/other-builds/moses2/.project

@@ -982,6 +982,11 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses2/legacy/gzfilebuf.h</locationURI>
 		</link>
+		<link>
+			<name>legacy/xmlrpc-c.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses2/legacy/xmlrpc-c.h</locationURI>
+		</link>
 		<link>
 			<name>parameters/AllOptions.cpp</name>
 			<type>1</type>

moses2/legacy/Util2.h

@@ -17,6 +17,15 @@
 namespace Moses2
 {
 
+#ifdef TRACE_ERR
+#undef TRACE_ERR
+#endif
+#ifdef TRACE_ENABLE
+#define TRACE_ERR(str) do { std::cerr << str; } while (false)
+#else
+#define TRACE_ERR(str) do {} while (false)
+#endif
+
 template<typename T>
 class UnorderedComparer
 {

moses2/legacy/xmlrpc-c.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#ifdef HAVE_XMLRPC_C
+#include <xmlrpc-c/base.hpp>
+#else
+namespace xmlrpc_c
+{
+class value;
+}
+#endif

moses2/parameters/AllOptions.cpp

@@ -1,5 +1,6 @@
 // -*- mode: c++; indent-tabs-mode: nil; tab-width: 2 -*-
 #include "../legacy/Parameter.h"
+#include "../legacy/Util2.h"
 #include "AllOptions.h"
 
 namespace Moses2

moses2/parameters/ContextParameters.cpp

@@ -1,5 +1,4 @@
 #include "ContextParameters.h"
-#include "moses/Util.h"
 #include "../legacy/Parameter.h"
 
 namespace Moses2

moses2/parameters/ContextParameters.h

@@ -1,8 +1,6 @@
 // -*- mode: c++; indent-tabs-mode: nil; tab-width: 2 -*-
 #pragma once
 #include <string>
-#include "moses/TypeDef.h"
-#include "moses/Util.h"
 #include "OptionsBaseClass.h"
 
 namespace Moses2

moses2/parameters/InputOptions.cpp

@@ -2,8 +2,6 @@
 #include "InputOptions.h"
 #include <vector>
 #include <iostream>
-// #include "moses/StaticData.h"
-#include "moses/TypeDef.h"
 #include "../legacy/Parameter.h"
 
 namespace Moses2

moses2/parameters/OOVHandlingOptions.cpp

@@ -2,8 +2,6 @@
 #include "OOVHandlingOptions.h"
 #include <vector>
 #include <iostream>
-#include "moses/StaticData.h"
-#include "moses/TypeDef.h"
 #include "../legacy/Parameter.h"
 
 namespace Moses2

moses2/parameters/OptionsBaseClass.cpp

@@ -1,6 +1,5 @@
 // -*- mode: c++; indent-tabs-mode: nil; tab-width:2  -*-
 #include "OptionsBaseClass.h"
-#include "moses/Util.h"
 #include "../legacy/Parameter.h"
 
 namespace Moses2

moses2/parameters/OptionsBaseClass.h

@@ -1,6 +1,6 @@
 // -*- mode: c++; indent-tabs-mode: nil; tab-width: 2 -*-
 #pragma once
-#include "moses/xmlrpc-c.h"
+#include "../legacy/xmlrpc-c.h"
 #include <string>
 #include <map>
 namespace Moses2