Change Namespace in TER library

25 files changed, 35 insertions, 35 deletions

diff --git a/mert/TER/alignmentStruct.cpp b/mert/TER/alignmentStruct.cpp
index e2a880396..74e811902 100644
--- a/mert/TER/alignmentStruct.cpp
+++ b/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()
     {
diff --git a/mert/TER/alignmentStruct.h b/mert/TER/alignmentStruct.h
index 0963fbe94..87d4ba9fa 100644
--- a/mert/TER/alignmentStruct.h
+++ b/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
     {
diff --git a/mert/TER/bestShiftStruct.cpp b/mert/TER/bestShiftStruct.cpp
index 8c27f1ff8..1e3ea0b52 100644
--- a/mert/TER/bestShiftStruct.cpp
+++ b/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()
     {
diff --git a/mert/TER/bestShiftStruct.h b/mert/TER/bestShiftStruct.h
index 144787faa..eb8465ffb 100644
--- a/mert/TER/bestShiftStruct.h
+++ b/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
     {
diff --git a/mert/TER/hashMap.cpp b/mert/TER/hashMap.cpp
index de84ff796..3d17ae42b 100644
--- a/mert/TER/hashMap.cpp
+++ b/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()
diff --git a/mert/TER/hashMap.h b/mert/TER/hashMap.h
index 017e6b831..40cd9e187 100644
--- a/mert/TER/hashMap.h
+++ b/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
     {
diff --git a/mert/TER/hashMapInfos.cpp b/mert/TER/hashMapInfos.cpp
index 23f57d808..1ca39240c 100644
--- a/mert/TER/hashMapInfos.cpp
+++ b/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()
diff --git a/mert/TER/hashMapInfos.h b/mert/TER/hashMapInfos.h
index 58cd50aef..5e7f9c9ec 100644
--- a/mert/TER/hashMapInfos.h
+++ b/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
     {
diff --git a/mert/TER/hashMapStringInfos.cpp b/mert/TER/hashMapStringInfos.cpp
index 773c148d4..895a037ce 100644
--- a/mert/TER/hashMapStringInfos.cpp
+++ b/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()
diff --git a/mert/TER/hashMapStringInfos.h b/mert/TER/hashMapStringInfos.h
index 3ea3794e5..4ed986096 100644
--- a/mert/TER/hashMapStringInfos.h
+++ b/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
     {
diff --git a/mert/TER/infosHasher.cpp b/mert/TER/infosHasher.cpp
index 8ce23ae44..1fe35b8eb 100644
--- a/mert/TER/infosHasher.cpp
+++ b/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 )
     {
diff --git a/mert/TER/infosHasher.h b/mert/TER/infosHasher.h
index 692bde49d..0c5d44c3d 100644
--- a/mert/TER/infosHasher.h
+++ b/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
     {
diff --git a/mert/TER/stringHasher.cpp b/mert/TER/stringHasher.cpp
index f4d1526e8..9b69bd15c 100644
--- a/mert/TER/stringHasher.cpp
+++ b/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 )
     {
diff --git a/mert/TER/stringHasher.h b/mert/TER/stringHasher.h
index e2a79834c..5e380c96e 100644
--- a/mert/TER/stringHasher.h
+++ b/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
diff --git a/mert/TER/stringInfosHasher.cpp b/mert/TER/stringInfosHasher.cpp
index 007fd720f..4d0312a52 100644
--- a/mert/TER/stringInfosHasher.cpp
+++ b/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 )
     {
diff --git a/mert/TER/stringInfosHasher.h b/mert/TER/stringInfosHasher.h
index f35e4596b..596f9788e 100644
--- a/mert/TER/stringInfosHasher.h
+++ b/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
     {
diff --git a/mert/TER/terAlignment.cpp b/mert/TER/terAlignment.cpp
index dda4a4239..555c3adc6 100644
--- a/mert/TER/terAlignment.cpp
+++ b/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()
diff --git a/mert/TER/terAlignment.h b/mert/TER/terAlignment.h
index e9524df7c..6e2c78e3e 100644
--- a/mert/TER/terAlignment.h
+++ b/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
diff --git a/mert/TER/terShift.cpp b/mert/TER/terShift.cpp
index e271ad6a7..870deea03 100644
--- a/mert/TER/terShift.cpp
+++ b/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()
diff --git a/mert/TER/terShift.h b/mert/TER/terShift.h
index 65a812d15..10a3e0b0d 100644
--- a/mert/TER/terShift.h
+++ b/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
     {
diff --git a/mert/TER/tercalc.cpp b/mert/TER/tercalc.cpp
index 8a84b49b3..ad7a5a15a 100644
--- a/mert/TER/tercalc.cpp
+++ b/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()
diff --git a/mert/TER/tercalc.h b/mert/TER/tercalc.h
index 22b5e2c9d..bb1c68f15 100644
--- a/mert/TER/tercalc.h
+++ b/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)
diff --git a/mert/TER/tools.cpp b/mert/TER/tools.cpp
index 22ee091a8..3c14884df 100644
--- a/mert/TER/tools.cpp
+++ b/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 )
diff --git a/mert/TER/tools.h b/mert/TER/tools.h
index 4c3b108cd..19ceaa967 100644
--- a/mert/TER/tools.h
+++ b/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;
diff --git a/mert/TerScorer.cpp b/mert/TerScorer.cpp
index fc40fdc82..2e60f5da2 100644
--- a/mert/TerScorer.cpp
+++ b/mert/TerScorer.cpp
@@ -10,7 +10,7 @@
 #include "Util.h"
 
 using namespace std;
-using namespace TERCpp;
+using namespace TERCPPNS_TERCpp;
 
 namespace MosesTuning
 {