From 2ae3d800d46e267a1d7765692fac71dbcd57c020 Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Tue, 26 Apr 2011 13:28:13 +0200
Subject: [PATCH] sync with corpus2 writer factory changes
---
CMakeLists.txt | 2 +-
libwccl/CMakeLists.txt | 2 +-
wccl-apps/wccl-match.cpp | 2 +-
wccl-apps/wccl-rules.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7069f0e..bfe9db6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.0)
set(ver_major "0")
set(ver_minor "0")
-set(ver_patch "1")
+set(ver_patch "2")
# use some of our own Find* scripts
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeScripts)
diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt
index 24e9c39..9a89400 100644
--- a/libwccl/CMakeLists.txt
+++ b/libwccl/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(wccl)
include_directories( ${CMAKE_CURRENT_BINARY_DIR}/include/ )
-find_package(Corpus2 1.0.6 REQUIRED)
+find_package(Corpus2 1.0.8 REQUIRED)
set(LIBS ${LIBS} ${Corpus2_LIBRARY})
find_package(PwrUtils 1.0.1 REQUIRED)
diff --git a/wccl-apps/wccl-match.cpp b/wccl-apps/wccl-match.cpp
index 2f5d752..3ef315c 100644
--- a/wccl-apps/wccl-match.cpp
+++ b/wccl-apps/wccl-match.cpp
@@ -204,7 +204,7 @@ int main(int argc, char** argv)
Corpus2::TokenTimer& timer = Corpus2::global_timer();
timer.register_signal_handler();
boost::shared_ptr<Corpus2::TokenWriter> writer;
- writer.reset(Corpus2::TokenWriter::create(output_format, std::cout, tagset));
+ writer = Corpus2::TokenWriter::create_stream_writer(output_format, std::cout, tagset);
boost::shared_ptr<Corpus2::TokenReader> reader;
foreach (std::string cf, corpora_files) {
reader = Corpus2::TokenReader::create_path_reader(input_format, tagset, cf);
diff --git a/wccl-apps/wccl-rules.cpp b/wccl-apps/wccl-rules.cpp
index e25257c..4b8b664 100644
--- a/wccl-apps/wccl-rules.cpp
+++ b/wccl-apps/wccl-rules.cpp
@@ -211,7 +211,7 @@ int main(int argc, char** argv)
Corpus2::TokenTimer& timer = Corpus2::global_timer();
timer.register_signal_handler();
boost::shared_ptr<Corpus2::TokenWriter> writer;
- writer.reset(Corpus2::TokenWriter::create(output_format, std::cout, tagset));
+ writer = Corpus2::TokenWriter::create_stream_writer(output_format, std::cout, tagset);
boost::shared_ptr<Corpus2::TokenReader> reader;
foreach (const std::string& f, corpora_files) {
reader = Corpus2::TokenReader::create_path_reader(input_format, tagset, f);
--
GitLab