sync swig wrappers with corpus2 wrapper changes

swig/boost_shared_ptr.i

-/**
- * Wrapper for boost shared_ptr
- */
-#ifndef SWIG_BOOST_SHAREDPTR
-#define SWIG_BOOST_SHAREDPTR
-
-%module boost_shared_ptr
-%{
-%}
-
-namespace boost {
-  template<class T> class shared_ptr {
-  public:
-    shared_ptr();
-    shared_ptr(T * p);
-    T* operator->();
-  private:
-    T * px;
-    int pn;
-  };
-}
-
-using namespace boost;
-
-#endif /* SWIG_BOOST_SHAREDPTR */

swig/libcclannotationmatch.i

@@ -7,7 +7,7 @@
 %}
 
 %include "libcclmatchdata.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
 

swig/libcclexpression.i

@@ -7,7 +7,7 @@
   #include <boost/noncopyable.hpp>
 %}
 
-%include "libcorpus/libcorpustagset.i"
+%include "libcorpus2/libcorpustagset.i"
 %include "std_string.i"
 
 namespace Wccl {

swig/libcclfunctionaloperator.i

@@ -12,7 +12,7 @@
 %include "libcclparsedexpression.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 // %template(ValuePtr) boost::shared_ptr<Wccl::Value>;
 %template(FunctionalOperatorPtr) boost::shared_ptr<Wccl::FunctionalOperator>;

swig/libcclfunctionalopsequence.i

@@ -14,7 +14,7 @@
 %include "std_string.i"
 %include "std_vector.i"
 
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %nodefaultctor Wccl::FunctionalOpSequence;
 

swig/libccllexicon.i

@@ -12,7 +12,7 @@
 %include "libcclstrset.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %rename(map_t) boost::unordered_map<UnicodeString, UnicodeString>;
 

swig/libccllexicons.i

@@ -9,7 +9,7 @@
 %include "libccllexicon.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %rename(map_t) boost::unordered_map<std::string, boost::shared_ptr<Lexicon> >;
 

swig/libcclmatch.i

@@ -11,10 +11,10 @@
 %include "libccltokenmatch.i"
 %include "libcclannotationmatch.i"
 %include "libcclmatchvector.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
-// %include "boost_shared_ptr.i"
+// %include <libcorpus2/boost_shared_ptr.i>
 
 %feature("notabstract") Wccl::Match;
 

swig/libcclmatchdata.i

@@ -7,10 +7,10 @@
 %}
 
 %include "libcclmatch.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %nodefaultctor Wccl::MatchData;
 

swig/libcclmatchrule.i

@@ -8,10 +8,10 @@
 
 %include "libcclvariables.i"
 %include "libcclparsedexpression.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 namespace Wccl {
   class MatchRule : public ParsedExpression {

swig/libcclmatchrulesequence.i

@@ -8,11 +8,11 @@
 
 %include "libcclmatchrule.i"
 %include "libcclexpression.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
 %include "std_vector.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template(MatchRuleVector) std::vector<Wccl::MatchRule>;
 %template(MatchRuleSequencePtr) boost::shared_ptr<Wccl::MatchRule>;

swig/libcclmatchvector.i

@@ -10,10 +10,10 @@
 %include "libcclmatchdata.i"
 %include "libccltokenmatch.i"
 %include "libcclannotationmatch.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template(MatchVectorPtr) boost::shared_ptr<Wccl::MatchVector>;
 

swig/libccloperator.i

@@ -17,7 +17,7 @@
 */
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %feature("notabstract") Wccl::Operator;
 

swig/libcclparsedexpression.i

@@ -16,7 +16,7 @@
 %include "libcclexpression.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template (ParsedExpressionPtr) boost::shared_ptr<Wccl::ParsedExpression>;
 

swig/libcclparser.i

@@ -12,11 +12,11 @@
 %include "libcclwcclfile.i"
 %include "libcclfunctionaloperator.i"
 
-%include "libcorpus/libcorpustagset.i"
+%include "libcorpus2/libcorpustagset.i"
 
 %include "std_string.i"
 %include "std_vector.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 namespace Wccl {
   class Parser {

swig/libcclsentencecontext.i

@@ -6,14 +6,14 @@
   #include <libwccl/sentencecontext.h>
 %}
 
-%include "libcorpus/libcorpustoken.i"
-%include "libcorpus/libcorpuslexeme.i"
-%include "libcorpus/libcorpussentence.i"
+%include "libcorpus2/libcorpustoken.i"
+%include "libcorpus2/libcorpuslexeme.i"
+%include "libcorpus2/libcorpussentence.i"
 
 %include "libcclposition.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 // %feature("notabstract") Wccl::SentenceContext;
 

swig/libccltagrule.i

@@ -12,10 +12,10 @@
 %include "libcclsentencecontext.i"
 %include "libcclparsedexpression.i"
 
-%include "libcorpus/libcorpustagset.i"
+%include "libcorpus2/libcorpustagset.i"
 
 %include "std_string.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template(TagRulePtr) boost::shared_ptr<Wccl::TagRule>;
 

swig/libccltagrulesequence.i

@@ -9,11 +9,11 @@
 %include "libcclbool.i"
 %include "libccltagrule.i"
 %include "libcclexpression.i"
-%include "libcorpus/libcorpussentence.i"
+%include "libcorpus2/libcorpussentence.i"
 
 %include "std_string.i"
 %include "std_vector.i"
-%include "boost_shared_ptr.i"
+%include <libcorpus2/boost_shared_ptr.i>
 
 %template(StdVectorTagRule) std::vector<TagRule>;
 %template(TagRuleSequencPtr) boost::shared_ptr<Wccl::TagRuleSequence>;

swig/libccltokenmatch.i

@@ -7,7 +7,7 @@
 %}
 
 %include "libcclmatchdata.i"
-%include "libcorpus/libcorpusannotatedsentence.i"
+%include "libcorpus2/libcorpusannotatedsentence.i"
 
 %nodefaultctor Wccl::TokenMatch;
 

swig/libccltset.i

@@ -10,8 +10,8 @@
 /* Include required headers */
 %include "std_string.i"
 %include "libcclvalue.i"
-%include "libcorpus/libcorpustag.i"
-%include "libcorpus/libcorpustagset.i"
+%include "libcorpus2/libcorpustag.i"
+%include "libcorpus2/libcorpustagset.i"
 
 %feature("notabstract") Wccl::TSet;