updated jtalk and mecab to support MSVC2012. nvdajp ticket 32631

diff --git a/include/jtalk/libopenjtalk/mecab/src/char_property.cpp b/include/jtalk/libopenjtalk/mecab/src/char_property.cpp
index b9348f0..6b2db4b 100644 (file)
--- a/include/jtalk/libopenjtalk/mecab/src/char_property.cpp
+++ b/include/jtalk/libopenjtalk/mecab/src/char_property.cpp
@@ -191,7 +191,7 @@ bool CharProperty::compile(const char *cfile,
       c.length  = std::atoi(col[3]);\r
       c.default_type = id++;\r
 \r
-      category.insert(std::make_pair<std::string, CharInfo>(key, c));\r
+      category.insert(std::pair<std::string, CharInfo>(key, c));\r
       category_ary.push_back(key);\r
     }\r
   }\r

diff --git a/include/jtalk/libopenjtalk/mecab/src/context_id.cpp b/include/jtalk/libopenjtalk/mecab/src/context_id.cpp
index ef553d6..df7cde4 100644 (file)
--- a/include/jtalk/libopenjtalk/mecab/src/context_id.cpp
+++ b/include/jtalk/libopenjtalk/mecab/src/context_id.cpp
@@ -28,7 +28,7 @@ bool open_map(const char *filename,
     if (iconv) {\r
       iconv->convert(&pos);\r
     }\r
-    cmap->insert(std::make_pair<std::string, int>\r
+    cmap->insert(std::pair<std::string, int>\r
                  (pos, std::atoi(col[0])));\r
   }\r
   return true;\r

diff --git a/include/jtalk/libopenjtalk/mecab/src/dictionary.cpp b/include/jtalk/libopenjtalk/mecab/src/dictionary.cpp
index a673539..9ea0548 100644 (file)
--- a/include/jtalk/libopenjtalk/mecab/src/dictionary.cpp
+++ b/include/jtalk/libopenjtalk/mecab/src/dictionary.cpp
@@ -245,7 +245,7 @@ bool Dictionary::compile(const Param &param,
       token->wcost = cost;\r
       token->feature = offset;\r
       token->compound = 0;\r
-      dic.push_back(std::make_pair<std::string, Token*>(w, token));\r
+      dic.push_back(std::pair<std::string, Token*>(w, token));\r
 \r
       // append to output buffer\r
       if (!wakati) fbuf.append(key.data(), key.size());\r

diff --git a/include/jtalk/libopenjtalk/mecab/src/dictionary_rewriter.cpp b/include/jtalk/libopenjtalk/mecab/src/dictionary_rewriter.cpp
index 9700cf7..e159ebf 100644 (file)
--- a/include/jtalk/libopenjtalk/mecab/src/dictionary_rewriter.cpp
+++ b/include/jtalk/libopenjtalk/mecab/src/dictionary_rewriter.cpp
@@ -230,7 +230,7 @@ bool DictionaryRewriter::rewrite2(const std::string &feature,
     f.ufeature = *ufeature;\r
     f.lfeature = *lfeature;\r
     f.rfeature = *rfeature;\r
-    cache_.insert(std::make_pair<std::string, FeatureSet>(feature, f));\r
+    cache_.insert(std::pair<std::string, FeatureSet>(feature, f));\r
   } else {\r
     *ufeature = it->second.ufeature;\r
     *lfeature = it->second.lfeature;\r

diff --git a/include/jtalk/libopenjtalk/mecab/src/feature_index.cpp b/include/jtalk/libopenjtalk/mecab/src/feature_index.cpp
index ed59815..f628198 100644 (file)
--- a/include/jtalk/libopenjtalk/mecab/src/feature_index.cpp
+++ b/include/jtalk/libopenjtalk/mecab/src/feature_index.cpp
@@ -252,7 +252,7 @@ bool EncoderFeatureIndex::buildFeature(LearnerPath *path) {
       feature_cache_.insert(std::pair\r
                             <std::string, std::pair<const int *, size_t> >\r
                             (key,\r
-                             std::make_pair<const int *, size_t>\r
+                             std::pair<const int *, size_t>\r
                              (path->rnode->fvector, 1)));\r
     }\r
   }\r
@@ -271,7 +271,7 @@ bool EncoderFeatureIndex::buildFeature(LearnerPath *path) {
         return false;\r
       feature_cache_.insert(std::pair\r
                             <std::string, std::pair<const int *, size_t> >\r
-                            (key, std::make_pair<const int *, size_t>\r
+                            (key, std::pair<const int *, size_t>\r
                              (path->fvector, 1)));\r
     }\r
   }\r
@@ -391,7 +391,7 @@ int DecoderFeatureIndex::id(const char *key) {
 int EncoderFeatureIndex::id(const char *key) {\r
   std::map<std::string, int>::const_iterator it = dic_.find(key);\r
   if (it == dic_.end()) {\r
-    dic_.insert(std::make_pair<std::string, int>(std::string(key), maxid_));\r
+    dic_.insert(std::pair<std::string, int>(std::string(key), maxid_));\r
     return maxid_++;\r
   } else {\r
     return it->second;\r
@@ -418,7 +418,7 @@ void EncoderFeatureIndex::shrink(size_t freq,
   std::map<int, int> old2new;\r
   for (size_t i = 0; i < freqv.size(); ++i) {\r
     if (freqv[i] >= freq)\r
-      old2new.insert(std::make_pair<int, int>(i, maxid_++));\r
+      old2new.insert(std::pair<int, int>(i, maxid_++));\r
   }\r
 \r
   // update dic_\r

diff --git a/include/jtalk/setenv-x86.cmd b/include/jtalk/setenv-x86.cmd
deleted file mode 100644 (file)
index 054b81a..0000000
--- a/include/jtalk/setenv-x86.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-call "C:\Program Files\Microsoft SDKs\Windows\v7.1\bin\setenv.cmd" /x86 /Release\r
-color\r

diff --git a/jptools/build-and-test.cmd b/jptools/build-and-test.cmd
index 709f268..c0f8ea1 100644 (file)
--- a/jptools/build-and-test.cmd
+++ b/jptools/build-and-test.cmd
@@ -1,4 +1,6 @@
+call setenv-x86.cmd\r
 cd ..\include\jtalk\r
+call all-clean.cmd\r
 call all-build.cmd\r
 call all-install.cmd\r
 cd ..\..\jptools\r

diff --git a/jptools/setenv-x86.cmd b/jptools/setenv-x86.cmd
new file mode 100644 (file)
index 0000000..b428948
--- /dev/null
+++ b/jptools/setenv-x86.cmd
@@ -0,0 +1 @@
+call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\vcvars32.bat"\r