summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-07-15 21:55:55 +0000
committerredpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-07-15 21:55:55 +0000
commitcad8dd252814fdf76caf3d5576d1f8f877524253 (patch)
tree925cf26864379e89165ada1514b01aa286a31353
parentcaac6b17b54e87c169d6beaa584f487ee6a94026 (diff)
fix potential namespace conflict:
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@271 ec762483-ff6d-05da-a07a-a48fb63a330f
-rw-r--r--extools/extract.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/extools/extract.cc b/extools/extract.cc
index 44cd51af..a9de142e 100644
--- a/extools/extract.cc
+++ b/extools/extract.cc
@@ -8,6 +8,7 @@
#include <boost/tuple/tuple_comparison.hpp>
#include <boost/functional/hash.hpp>
+#include <boost/tuple/tuple.hpp>
#include "sentence_pair.h"
#include "tdict.h"
@@ -15,8 +16,9 @@
#include "array2d.h"
using namespace std;
-using namespace tr1;
using namespace boost;
+using std::tr1::unordered_map;
+using boost::tuple;
namespace {
inline bool IsWhitespace(char c) { return c == ' ' || c == '\t'; }