Skip to content
Snippets Groups Projects
Commit b2d601a2 authored by Johannes Heinecke's avatar Johannes Heinecke
Browse files

deleted '#ifdef __cplusplus', since everything is compiled with g++ now

parent 60427349
No related branches found
No related tags found
1 merge request!9Johannes
This commit is part of merge request !9. Comments created here will be created in the context of that merge request.
...@@ -17,9 +17,9 @@ import MacaonLemmatizer ...@@ -17,9 +17,9 @@ import MacaonLemmatizer
import MacaonParser import MacaonParser
# for this example you should be in maca_data2 # for this example you should be in maca_data2
mt = MacaonTagger.MacaonTransTagger("jh-seq", "jh-seq/eval/wplgfs.mcd") mt = MacaonTagger.MacaonTransTagger("fr", "fr/eval/wplgfs.mcd")
ml = MacaonLemmatizer.MacaonTransLemmatizer("jh-seq", "jh-seq/eval/wplgfs.mcd") ml = MacaonLemmatizer.MacaonTransLemmatizer("fr", "fr/eval/wplgfs.mcd")
mp = MacaonParser.MacaonTransParser("jh-seq", "jh-seq/eval/wplgfs.mcd") mp = MacaonParser.MacaonTransParser("fr", "fr/eval/wplgfs.mcd")
mcf="""La mcf="""La
grosse grosse
......
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
#include <iostream> #include <iostream>
#ifdef __cplusplus //#ifdef __cplusplus
extern "C"{ //extern "C"{
#endif //#endif
#include "dico.h" #include "dico.h"
#include "word.h" #include "word.h"
#include "util.h" #include "util.h"
#ifdef __cplusplus //#ifdef __cplusplus
} //}
#endif //#endif
#include "maca_lemmatizer_export.h" #include "maca_lemmatizer_export.h"
......
#ifdef __cplusplus //#ifdef __cplusplus
extern "C"{ //extern "C"{
#endif //#endif
#include "context.h" #include "context.h"
#include "../../../maca_trans_parser/src/config.h" #include "../../../maca_trans_parser/src/config.h"
#include "word.h" #include "word.h"
#ifdef __cplusplus //#ifdef __cplusplus
} //}
#endif //#endif
class MacaonTransLemmatizer { class MacaonTransLemmatizer {
......
...@@ -2,15 +2,10 @@ ...@@ -2,15 +2,10 @@
#include <cstring> #include <cstring>
#ifdef __cplusplus //#ifdef __cplusplus
extern "C"{ //extern "C"{
#endif //#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"
#include "simple_decoder_parser_arc_eager.h" #include "simple_decoder_parser_arc_eager.h"
#include "movement_parser_arc_eager.h" #include "movement_parser_arc_eager.h"
#include "feat_fct.h" #include "feat_fct.h"
...@@ -19,9 +14,9 @@ extern "C"{ ...@@ -19,9 +14,9 @@ extern "C"{
#include "feature_table.h" #include "feature_table.h"
#include "dico.h" #include "dico.h"
#ifdef __cplusplus //#ifdef __cplusplus
} //}
#endif //#endif
#include "maca_trans_parser_export.h" #include "maca_trans_parser_export.h"
......
#ifdef __cplusplus //#ifdef __cplusplus
extern "C"{ //extern "C"{
#endif //#endif
#include "context.h" #include "context.h"
#include "config.h" #include "config.h"
#ifdef __cplusplus //#ifdef __cplusplus
} //}
#endif //#endif
class MacaonTransParser { class MacaonTransParser {
......
...@@ -2,22 +2,17 @@ ...@@ -2,22 +2,17 @@
#include <cstring> #include <cstring>
#ifdef __cplusplus //#ifdef __cplusplus
extern "C"{ //extern "C"{
#endif //#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"
#include "config2feat_vec.h" #include "config2feat_vec.h"
#include "movement_tagger.h" #include "movement_tagger.h"
#include "simple_decoder_tagger.h" #include "simple_decoder_tagger.h"
#ifdef __cplusplus //#ifdef __cplusplus
} //}
#endif //#endif
#include "maca_trans_tagger_export.h" #include "maca_trans_tagger_export.h"
......
//#include "maca_trans_parser/src/context.h" //#include "maca_trans_parser/src/context.h"
//#include "maca_common/include/word.h" //#include "maca_common/include/word.h"
#ifdef __cplusplus //#ifdef __cplusplus
extern "C"{ //extern "C"{
#endif //#endif
#include "context.h" #include "context.h"
#include "../../maca_common/include/word.h" #include "../../maca_common/include/word.h"
#ifdef __cplusplus //#ifdef __cplusplus
} //}
#endif //#endif
class MacaonTransTagger { class MacaonTransTagger {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment