diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp index 65b5691..3874d76 100644 --- a/ZRColaCompile/main.cpp +++ b/ZRColaCompile/main.cpp @@ -35,7 +35,7 @@ inline std::ostream& operator <<(std::ostream& stream, const ZRCola::translation unsigned __int32 count; // Write index count. - std::vector::size_type trans_count = db.idxComp.size(); + ZRCola::translation_db::indexComp::size_type trans_count = db.idxComp.size(); #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__) // 4G check if (trans_count > 0xffffffff) { @@ -91,7 +91,7 @@ inline std::ostream& operator <<(std::ostream& stream, const ZRCola::keyseq_db & unsigned __int32 count; // Write index count. - std::vector::size_type ks_count = db.idxChr.size(); + ZRCola::keyseq_db::indexChr::size_type ks_count = db.idxChr.size(); #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__) // 4G check if (ks_count > 0xffffffff) { @@ -303,7 +303,7 @@ int _tmain(int argc, _TCHAR *argv[]) db.idxKey.sort(); // Check key sequences. - for (std::vector::size_type i = 1, n = db.idxKey.size(); i < n; i++) { + for (ZRCola::keyseq_db::indexKey::size_type i = 1, n = db.idxKey.size(); i < n; i++) { const ZRCola::keyseq_db::keyseq &ks1 = db.idxKey[i - 1], &ks2 = db.idxKey[i ]; diff --git a/lib/libZRCola/src/translate.cpp b/lib/libZRCola/src/translate.cpp index 53a1f4d..9f2619f 100644 --- a/lib/libZRCola/src/translate.cpp +++ b/lib/libZRCola/src/translate.cpp @@ -34,7 +34,7 @@ void ZRCola::translation_db::Compose(_In_z_count_(inputMax) const wchar_t* input if (map) map->clear(); - std::vector::size_type compositionsCount = idxComp.size(); + indexComp::size_type compositionsCount = idxComp.size(); for (size_t i = 0; i < inputMax;) { // Start with the full search area at i-th character. @@ -134,7 +134,7 @@ void ZRCOLA_API ZRCola::translation_db::Decompose(_In_z_count_(inputMax) const w if (map) map->clear(); - std::vector::size_type decompositionsCount = idxDecomp.size(); + indexDecomp::size_type decompositionsCount = idxDecomp.size(); for (size_t i = 0; i < inputMax;) { // Find whether the character can be decomposed.