From 9c865e490a398cdadf49c811f354fb77bbf4610f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20K=C4=99dzia?= <Pawel.Kedzia@pwr.wroc.pl>
Date: Thu, 17 Nov 2011 11:06:15 +0100
Subject: [PATCH] Swig wrappers using std_defs header now
---
swig/annotationchannel.i | 4 +++-
swig/chunk.i | 4 +++-
swig/tagset.i | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/swig/annotationchannel.i b/swig/annotationchannel.i
index 4010424..1d9c8da 100644
--- a/swig/annotationchannel.i
+++ b/swig/annotationchannel.i
@@ -8,9 +8,11 @@
%include "std_string.i"
%include "std_vector.i"
+
%include "iob.i"
+%include "std_defs.i"
-%template(IntVector) std::vector<int>;
+// %template(IntVector) std::vector<int>;
%template(IOBVector) std::vector<Corpus2::IOB::Enum>;
%template(AnnotationVector) std::vector<Corpus2::Annotation>;
diff --git a/swig/chunk.i b/swig/chunk.i
index ac9b2e0..08412c3 100644
--- a/swig/chunk.i
+++ b/swig/chunk.i
@@ -7,6 +7,8 @@
%}
+%include "std_defs.i"
+
%include "std_set.i"
%include "std_map.i"
%include "std_pair.i"
@@ -18,7 +20,7 @@
%template(ChunkPtr) boost::shared_ptr<Corpus2::Chunk>;
%template(SentencePtrVector) std::vector<boost::shared_ptr<Sentence> >;
-%template(attr_map_t) std::map<std::string, std::string>;
+// %template(attr_map_t) std::map<std::string, std::string>;
namespace Corpus2 {
class Chunk {
diff --git a/swig/tagset.i b/swig/tagset.i
index 3df9d95..f4305db 100644
--- a/swig/tagset.i
+++ b/swig/tagset.i
@@ -9,13 +9,14 @@
%include "tag.i"
%include "exception.i"
+%include "std_defs.i"
%include "std_string.i"
%include "std_vector.i"
%feature("notabstract") Corpus2::Tagset;
%template(TagVector) std::vector<Corpus2::Tag>;
-%template(StdStringVector) std::vector<std::string>;
+// %template(StdStringVector) std::vector<std::string>;
namespace Corpus2 {
class Tagset;
--
GitLab