dan's patches

10 files changed, 16 insertions, 59 deletions

diff --git a/GIZA++-v2/ATables.h b/GIZA++-v2/ATables.h
index a1183ab..70d5030 100644
--- a/GIZA++-v2/ATables.h
+++ b/GIZA++-v2/ATables.h
@@ -41,12 +41,6 @@ USA.
 #include <set>
 #include "Vector.h"
 #include <utility>
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
 #include <fstream>
 #include "Array4.h"
 #include "myassert.h"
diff --git a/GIZA++-v2/AlignTables.h b/GIZA++-v2/AlignTables.h
index 773b172..0daa2c3 100644
--- a/GIZA++-v2/AlignTables.h
+++ b/GIZA++-v2/AlignTables.h
@@ -35,12 +35,6 @@ USA.
 //#include <vector>
 #include "Vector.h"
 #include <utility>
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
 #include <math.h>
 #include <fstream>
 #include "transpair_model1.h"
@@ -116,7 +110,7 @@ public:
   LogProb getValue(Vector<WordIndex>&)const; // retrieve prob. of alignment
   inline void clear(void){ a.clear();}; // clear hash table 
   //  void printTable(const char* filename);
-  inline void resize(WordIndex n) {a.resize(n);}; // resize table
+  //inline void resize(WordIndex n) {a.resize(n);}; // resize table
 
 };
 
diff --git a/GIZA++-v2/HMMTables.h b/GIZA++-v2/HMMTables.h
index 3f35129..051bd0a 100644
--- a/GIZA++-v2/HMMTables.h
+++ b/GIZA++-v2/HMMTables.h
@@ -24,12 +24,6 @@ USA.
 #define HMM_TABLES_H_ASDF_DEFINED
 #include "FlexArray.h"
 
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
 #include "Array.h"
 #include <map>
 #include "mymath.h"
diff --git a/GIZA++-v2/Makefile b/GIZA++-v2/Makefile
index 236e672..9825511 100644
--- a/GIZA++-v2/Makefile
+++ b/GIZA++-v2/Makefile
@@ -4,8 +4,8 @@ INSTALLDIR ?= /usr/local/bin/
 
 #CXX = g++
 
-CFLAGS = $(CFLAGS_GLOBAL) -Wall
-CFLAGS_OPT = $(CFLAGS) -O3 -DNDEBUG -DWORDINDEX_WITH_4_BYTE -DBINARY_SEARCH_FOR_TTABLE -O3 -DNDEBUG -DWORDINDEX_WITH_4_BYTE -ffast-math
+CFLAGS = $(CFLAGS_GLOBAL) -Wall -Wno-parentheses
+CFLAGS_OPT = $(CFLAGS) -O3 -DNDEBUG -DWORDINDEX_WITH_4_BYTE -O3 -DNDEBUG -DWORDINDEX_WITH_4_BYTE -ffast-math
 #CFLAGS_OPT = $(CFLAGS) -O3 -DNDEBUG -DWORDINDEX_WITH_4_BYTE -DBINARY_SEARCH_FOR_TTABLE -O3 -static -DNDEBUG -DWORDINDEX_WITH_4_BYTE
 CFLAGS_PRF = $(CFLAGS) -O2 -pg -DNDEBUG -DWORDINDEX_WITH_4_BYTE
 CFLAGS_DBG = $(CFLAGS) -g -DDEBUG -DWORDINDEX_WITH_4_BYTE
@@ -134,11 +134,11 @@ dependencies:
 -include dependencies
 
 snt2plain.out: snt2plain.cpp
-	$(CXX) $(LDFLAGS) -O3 -Wno-deprecated -W -Wall snt2plain.cpp -o snt2plain.out
+	$(CXX) $(LDFLAGS) -O3 -W -Wall snt2plain.cpp -o snt2plain.out
 
 plain2snt.out: plain2snt.cpp
-	$(CXX) $(LDFLAGS) -O3 -Wno-deprecated -W -Wall plain2snt.cpp -o plain2snt.out
+	$(CXX) $(LDFLAGS) -O3 -W -Wall plain2snt.cpp -o plain2snt.out
 
 snt2cooc.out: snt2cooc.cpp
-	$(CXX) $(LDFLAGS) -O3 -g -W -Wall -Wno-deprecated snt2cooc.cpp -o snt2cooc.out
+	$(CXX) $(LDFLAGS) -O3 -g -W -Wall snt2cooc.cpp -o snt2cooc.out
 
diff --git a/GIZA++-v2/TTables.h b/GIZA++-v2/TTables.h
index 87d0196..85673ef 100644
--- a/GIZA++-v2/TTables.h
+++ b/GIZA++-v2/TTables.h
@@ -46,13 +46,6 @@ USA.
 #include "Vector.h"
 #include <utility>
 
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-
 #include <fstream>
 
 #include "Globals.h"
@@ -394,7 +387,7 @@ public:
 
   inline const hash_map<wordPairIds, CPPair, hashpair, equal_to<wordPairIds> >& getHash(void) const {return ef;};
   /* get a refernece to the hash table */
-  inline void resize(WordIndex n) {ef.resize(n);};
+  //inline void resize(WordIndex n) {ef.resize(n);};
   // to resize he hash table 
 
   void printProbTable(const char* filename, const Vector<WordEntry>&, const Vector<WordEntry>&,bool actual) const;
diff --git a/GIZA++-v2/hmm.h b/GIZA++-v2/hmm.h
index ee6009b..6909bea 100644
--- a/GIZA++-v2/hmm.h
+++ b/GIZA++-v2/hmm.h
@@ -32,12 +32,6 @@ USA.
 #include "Vector.h"
 #include <utility>
 
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
 #include <fstream>
 #include <cmath>
 #include <ctime>
diff --git a/GIZA++-v2/model1.h b/GIZA++-v2/model1.h
index 1dceb65..7273049 100644
--- a/GIZA++-v2/model1.h
+++ b/GIZA++-v2/model1.h
@@ -32,12 +32,6 @@ USA.
 #include <set>
 #include <utility>
 
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
 #include <ctime>
 #include <fstream>
 #include <cmath>
diff --git a/GIZA++-v2/model2.h b/GIZA++-v2/model2.h
index 46b7e3e..ada807e 100644
--- a/GIZA++-v2/model2.h
+++ b/GIZA++-v2/model2.h
@@ -32,13 +32,6 @@ USA.
 #include "Vector.h"
 #include <utility>
 
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-
 #include <fstream>
 #include <cmath>
 #include <ctime>
diff --git a/GIZA++-v2/model3.h b/GIZA++-v2/model3.h
index 964e41b..ea502e0 100644
--- a/GIZA++-v2/model3.h
+++ b/GIZA++-v2/model3.h
@@ -29,12 +29,6 @@ USA.
 #include <set>
 #include "Vector.h"
 #include <utility>
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
 
 
 #include <ctime>
diff --git a/GIZA++-v2/mystl.h b/GIZA++-v2/mystl.h
index 65c5ca1..a3a6e41 100644
--- a/GIZA++-v2/mystl.h
+++ b/GIZA++-v2/mystl.h
@@ -18,12 +18,19 @@ using namespace _STL;
 #include "myassert.h"
 #include <string>
 #include <utility>
-#if __GNUC__>2
+
+#if __GNUC__==2
+#include <hash_map>
+#elsif __GNUC__==3
 #include <ext/hash_map>
 using __gnu_cxx::hash_map;
 #else
-#include <hash_map>
+#include <tr1/unordered_map>
+#define hash_map unordered_map
+using namespace std::tr1;
 #endif
+
+#include <vector>
 #include <iostream>
 #include "mymath.h"
 #include "Array2.h"