Change Namespace in TER library

mert/TER/alignmentStruct.cpp

@@ -21,7 +21,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "alignmentStruct.h"
 
 using namespace std;
-namespace TERCpp
+namespace TERCPPNS_TERCpp
 {
     string alignmentStruct::toString()
     {

mert/TER/alignmentStruct.h

@@ -30,9 +30,9 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
 using namespace std;
-using namespace Tools;
+using namespace TERCPPNS_Tools;
 
-namespace TERCpp
+namespace TERCPPNS_TERCpp
 {
     class alignmentStruct
     {

mert/TER/bestShiftStruct.cpp

@@ -22,7 +22,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 using namespace std;
 
-namespace TERCpp
+namespace TERCPPNS_TERCpp
 {
     bestShiftStruct::bestShiftStruct()
     {

mert/TER/bestShiftStruct.h

@@ -32,9 +32,9 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
 using namespace std;
-using namespace Tools;
+using namespace TERCPPNS_Tools;
 
-namespace TERCpp
+namespace TERCPPNS_TERCpp
 {
     class bestShiftStruct
     {

mert/TER/hashMap.cpp

@@ -25,7 +25,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 using namespace std;
 
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
 //     hashMap::hashMap();
     /*    hashMap::~hashMap()

mert/TER/hashMap.h

@@ -33,7 +33,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 using namespace std;
 
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
     class hashMap
     {

mert/TER/hashMapInfos.cpp

@@ -25,7 +25,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 using namespace std;
 
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
 //     hashMapInfos::hashMap();
     /*    hashMapInfos::~hashMap()

mert/TER/hashMapInfos.h

@@ -32,7 +32,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 using namespace std;
 
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
     class hashMapInfos
     {

mert/TER/hashMapStringInfos.cpp

@@ -25,7 +25,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 using namespace std;
 
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
     //     hashMapStringInfos::hashMap();
     /*    hashMapStringInfos::~hashMap()

mert/TER/hashMapStringInfos.h

@@ -32,7 +32,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 using namespace std;
 
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
     class hashMapStringInfos
     {

mert/TER/infosHasher.cpp

@@ -23,9 +23,9 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
 using namespace std;
-using namespace Tools;
+using namespace TERCPPNS_Tools;
 
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
     infosHasher::infosHasher (long cle,string cleTxt, vector<int> valueVecInt )
     {

mert/TER/infosHasher.h

@@ -29,7 +29,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "tools.h"
 
 using namespace std;
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
     class infosHasher
     {

mert/TER/stringHasher.cpp

@@ -24,7 +24,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 using namespace std;
 
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
     stringHasher::stringHasher ( long cle, string cleTxt, string valueTxt )
     {

mert/TER/stringHasher.h

@@ -25,7 +25,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <iostream>
 
 using namespace std;
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
 
     class stringHasher

mert/TER/stringInfosHasher.cpp

@@ -23,9 +23,9 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
 using namespace std;
-using namespace Tools;
+using namespace TERCPPNS_Tools;
 
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
     stringInfosHasher::stringInfosHasher ( long cle, string cleTxt, vector<string> valueVecInt )
     {

mert/TER/stringInfosHasher.h

@@ -27,7 +27,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "tools.h"
 
 using namespace std;
-namespace HashMapSpace
+namespace TERCPPNS_HashMapSpace
 {
     class stringInfosHasher
     {

mert/TER/terAlignment.cpp

@@ -21,7 +21,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 #include "terAlignment.h"
 using namespace std;
-namespace TERCpp
+namespace TERCPPNS_TERCpp
 {
 
     terAlignment::terAlignment()

mert/TER/terAlignment.h

@@ -30,8 +30,8 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
 using namespace std;
-// using namespace HashMapSpace;
-namespace TERCpp
+// using namespace TERCPPNS_HashMapSpace;
+namespace TERCPPNS_TERCpp
 {
 
     class terAlignment

mert/TER/terShift.cpp

@@ -21,7 +21,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "terShift.h"
 
 using namespace std;
-namespace TERCpp
+namespace TERCPPNS_TERCpp
 {
 
 // 	terShift::terShift()

mert/TER/terShift.h

@@ -30,9 +30,9 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
 using namespace std;
-using namespace Tools;
+using namespace TERCPPNS_Tools;
 
-namespace TERCpp
+namespace TERCPPNS_TERCpp
 {
     class terShift
     {

mert/TER/tercalc.cpp

@@ -31,8 +31,8 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
 #include "tercalc.h"
 using namespace std;
-using namespace Tools;
-namespace TERCpp
+using namespace TERCPPNS_Tools;
+namespace TERCPPNS_TERCpp
 {
 
     terCalc::terCalc()

mert/TER/tercalc.h

@@ -35,9 +35,9 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "bestShiftStruct.h"
 
 using namespace std;
-using namespace Tools;
-using namespace HashMapSpace;
-namespace TERCpp
+using namespace TERCPPNS_Tools;
+using namespace TERCPPNS_HashMapSpace;
+namespace TERCPPNS_TERCpp
 {
 // typedef size_t WERelement[2];
 // Vecteur d'alignement contenant le hash du mot et son evaluation (0=ok, 1=sub, 2=ins, 3=del)

mert/TER/tools.cpp

@@ -21,8 +21,8 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "tools.h"
 
 using namespace std;
-using namespace boost::xpressive;
-namespace Tools
+using namespace TERCPPNS_boost::xpressive;
+namespace TERCPPNS_Tools
 {
 
     string vectorToString ( vector<string> vec )

mert/TER/tools.h

@@ -33,7 +33,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 using namespace std;
 
-namespace Tools
+namespace TERCPPNS_Tools
 {
     typedef vector<double> vecDouble;
     typedef vector<char> vecChar;

mert/TerScorer.cpp

@@ -10,7 +10,7 @@
 #include "Util.h"
 
 using namespace std;
-using namespace TERCpp;
+using namespace TERCPPNS_TERCpp;
 
 namespace MosesTuning
 {