From b2d601a28bdd87a340b56b2b4fe5b8de42557234 Mon Sep 17 00:00:00 2001
From: "johannes.heinecke" <johannes.heinecke@orange.com>
Date: Wed, 13 Sep 2017 11:09:48 +0200
Subject: [PATCH] deleted '#ifdef __cplusplus', since everything is compiled
 with g++ now

---
 maca_export/example/example.py                |  6 +++---
 .../lemmatizer/maca_lemmatizer_export.cc      | 12 ++++++------
 .../lemmatizer/maca_lemmatizer_export.h       | 12 ++++++------
 .../parser/maca_trans_parser_export.cc        | 19 +++++++------------
 maca_export/parser/maca_trans_parser_export.h | 12 ++++++------
 .../tagger/maca_trans_tagger_export.cc        | 19 +++++++------------
 maca_export/tagger/maca_trans_tagger_export.h | 12 ++++++------
 7 files changed, 41 insertions(+), 51 deletions(-)

diff --git a/maca_export/example/example.py b/maca_export/example/example.py
index 03f7aa4..3352966 100755
--- a/maca_export/example/example.py
+++ b/maca_export/example/example.py
@@ -17,9 +17,9 @@ import MacaonLemmatizer
 import MacaonParser
 
 # for this example you should be in maca_data2
-mt = MacaonTagger.MacaonTransTagger("jh-seq", "jh-seq/eval/wplgfs.mcd")
-ml = MacaonLemmatizer.MacaonTransLemmatizer("jh-seq", "jh-seq/eval/wplgfs.mcd")
-mp = MacaonParser.MacaonTransParser("jh-seq", "jh-seq/eval/wplgfs.mcd")
+mt = MacaonTagger.MacaonTransTagger("fr", "fr/eval/wplgfs.mcd")
+ml = MacaonLemmatizer.MacaonTransLemmatizer("fr", "fr/eval/wplgfs.mcd")
+mp = MacaonParser.MacaonTransParser("fr", "fr/eval/wplgfs.mcd")
 
 mcf="""La
 grosse
diff --git a/maca_export/lemmatizer/maca_lemmatizer_export.cc b/maca_export/lemmatizer/maca_lemmatizer_export.cc
index 4d8075f..9acf431 100644
--- a/maca_export/lemmatizer/maca_lemmatizer_export.cc
+++ b/maca_export/lemmatizer/maca_lemmatizer_export.cc
@@ -3,17 +3,17 @@
 #include <iostream>
 
 
-#ifdef __cplusplus
-extern "C"{
-#endif 
+//#ifdef __cplusplus
+//extern "C"{
+//#endif 
 
  #include "dico.h"
  #include "word.h"
  #include "util.h"
 
-#ifdef __cplusplus
-}
-#endif
+//#ifdef __cplusplus
+//}
+//#endif
 
 #include "maca_lemmatizer_export.h"
 
diff --git a/maca_export/lemmatizer/maca_lemmatizer_export.h b/maca_export/lemmatizer/maca_lemmatizer_export.h
index c14401b..b4a183c 100644
--- a/maca_export/lemmatizer/maca_lemmatizer_export.h
+++ b/maca_export/lemmatizer/maca_lemmatizer_export.h
@@ -1,14 +1,14 @@
-#ifdef __cplusplus
-extern "C"{
-#endif 
+//#ifdef __cplusplus
+//extern "C"{
+//#endif 
 
  #include "context.h"
  #include "../../../maca_trans_parser/src/config.h"
  #include "word.h"
 
-#ifdef __cplusplus
-}
-#endif
+//#ifdef __cplusplus
+//}
+//#endif
 
 
 class MacaonTransLemmatizer {
diff --git a/maca_export/parser/maca_trans_parser_export.cc b/maca_export/parser/maca_trans_parser_export.cc
index d3d62d5..0315018 100644
--- a/maca_export/parser/maca_trans_parser_export.cc
+++ b/maca_export/parser/maca_trans_parser_export.cc
@@ -2,15 +2,10 @@
 #include <cstring>
 
 
-#ifdef __cplusplus
-extern "C"{
-#endif 
-
-    //#include "context.h"
-    //#include "maca_trans_parser/src/simple_decoder_parser_arc_eager.h"
-    //#include "maca_trans_parser/src/movement_parser_arc_eager.h"
-    //#include "maca_trans_parser/src/feat_fct.h"
-    //#include "maca_trans_parser/src/config2feat_vec.h"
+//#ifdef __cplusplus
+//extern "C"{
+//#endif 
+
 #include "simple_decoder_parser_arc_eager.h"
 #include "movement_parser_arc_eager.h"
 #include "feat_fct.h"
@@ -19,9 +14,9 @@ extern "C"{
 #include "feature_table.h"
 #include "dico.h"
 
-#ifdef __cplusplus
-}
-#endif
+//#ifdef __cplusplus
+//}
+//#endif
 
 #include "maca_trans_parser_export.h"
 
diff --git a/maca_export/parser/maca_trans_parser_export.h b/maca_export/parser/maca_trans_parser_export.h
index b95220e..403f704 100644
--- a/maca_export/parser/maca_trans_parser_export.h
+++ b/maca_export/parser/maca_trans_parser_export.h
@@ -1,14 +1,14 @@
 
-#ifdef __cplusplus
-extern "C"{
-#endif 
+//#ifdef __cplusplus
+//extern "C"{
+//#endif 
 
  #include "context.h"
  #include "config.h"
 
-#ifdef __cplusplus
-}
-#endif
+//#ifdef __cplusplus
+//}
+//#endif
 
 
 class MacaonTransParser {
diff --git a/maca_export/tagger/maca_trans_tagger_export.cc b/maca_export/tagger/maca_trans_tagger_export.cc
index dac1fed..8265743 100644
--- a/maca_export/tagger/maca_trans_tagger_export.cc
+++ b/maca_export/tagger/maca_trans_tagger_export.cc
@@ -2,22 +2,17 @@
 #include <cstring>
 
 
-#ifdef __cplusplus
-extern "C"{
-#endif 
-
-    //#include "context.h"
-    //#include "maca_trans_parser/src/context.h"
-    //#include "maca_trans_parser/src/config2feat_vec.h"
-    //#include "maca_trans_parser/src/movement_tagger.h"
-    //#include "maca_trans_parser/src/simple_decoder_tagger.h"
+//#ifdef __cplusplus
+//extern "C"{
+//#endif 
+
  #include "config2feat_vec.h"
  #include "movement_tagger.h"
  #include "simple_decoder_tagger.h"
 
-#ifdef __cplusplus
-}
-#endif
+//#ifdef __cplusplus
+//}
+//#endif
 
 #include "maca_trans_tagger_export.h"
 
diff --git a/maca_export/tagger/maca_trans_tagger_export.h b/maca_export/tagger/maca_trans_tagger_export.h
index eb87c07..1e234a8 100644
--- a/maca_export/tagger/maca_trans_tagger_export.h
+++ b/maca_export/tagger/maca_trans_tagger_export.h
@@ -1,16 +1,16 @@
 //#include "maca_trans_parser/src/context.h"
 //#include "maca_common/include/word.h"
 
-#ifdef __cplusplus
-extern "C"{
-#endif 
+//#ifdef __cplusplus
+//extern "C"{
+//#endif 
 
  #include "context.h"
  #include "../../maca_common/include/word.h"
 
-#ifdef __cplusplus
-}
-#endif
+//#ifdef __cplusplus
+//}
+//#endif
 
 
 class MacaonTransTagger {
-- 
GitLab