Swig wrappers using std_defs header now

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>;
 

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 {

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;