From 8a8078b36154e9746cdddf72380982e3c13d37fe Mon Sep 17 00:00:00 2001 From: kristof <Kristof.Szabados@ericsson.com> Date: Sat, 15 Apr 2017 12:44:14 +0200 Subject: [PATCH] lets make sure the other files know about the converter flags Signed-off-by: kristof <Kristof.Szabados@ericsson.com> --- xsdconvert/GeneralFunctions.cc | 1 + xsdconvert/SimpleType.cc | 1 + xsdconvert/TTCN3Module.cc | 1 + xsdconvert/TTCN3ModuleInventory.cc | 1 + xsdconvert/XMLParser.cc | 1 + xsdconvert/converter.cc | 2 ++ xsdconvert/converter.hh | 33 ++++++++++++++++++++++++++++++ 7 files changed, 40 insertions(+) create mode 100644 xsdconvert/converter.hh diff --git a/xsdconvert/GeneralFunctions.cc b/xsdconvert/GeneralFunctions.cc index 0cab0805b..7952f2f01 100644 --- a/xsdconvert/GeneralFunctions.cc +++ b/xsdconvert/GeneralFunctions.cc @@ -20,6 +20,7 @@ #include "SimpleType.hh" #include "TTCN3Module.hh" #include "ImportStatement.hh" +#include "converter.hh" #include <cctype> // for using "toupper" function #include <cstring> diff --git a/xsdconvert/SimpleType.cc b/xsdconvert/SimpleType.cc index 1d74291ba..dbc53a083 100644 --- a/xsdconvert/SimpleType.cc +++ b/xsdconvert/SimpleType.cc @@ -22,6 +22,7 @@ #include "TTCN3Module.hh" #include "ComplexType.hh" #include "Constant.hh" +#include "converter.hh" #include <math.h> #include <cfloat> diff --git a/xsdconvert/TTCN3Module.cc b/xsdconvert/TTCN3Module.cc index c7afda528..b503dbedb 100644 --- a/xsdconvert/TTCN3Module.cc +++ b/xsdconvert/TTCN3Module.cc @@ -23,6 +23,7 @@ #include "ImportStatement.hh" #include "Annotation.hh" #include "Constant.hh" +#include "converter.hh" #include "../common/version_internal.h" diff --git a/xsdconvert/TTCN3ModuleInventory.cc b/xsdconvert/TTCN3ModuleInventory.cc index 465eae546..bed82138b 100644 --- a/xsdconvert/TTCN3ModuleInventory.cc +++ b/xsdconvert/TTCN3ModuleInventory.cc @@ -23,6 +23,7 @@ #include "SimpleType.hh" #include "ComplexType.hh" #include "Constant.hh" +#include "converter.hh" extern bool h_flag_used; extern bool q_flag_used; diff --git a/xsdconvert/XMLParser.cc b/xsdconvert/XMLParser.cc index e3f8a0f83..17842852c 100644 --- a/xsdconvert/XMLParser.cc +++ b/xsdconvert/XMLParser.cc @@ -17,6 +17,7 @@ #include "TTCN3Module.hh" #include "SimpleType.hh" #include "ComplexType.hh" +#include "converter.hh" #include "GeneralFunctions.hh" diff --git a/xsdconvert/converter.cc b/xsdconvert/converter.cc index d4b0fbb90..0cb2ac44c 100644 --- a/xsdconvert/converter.cc +++ b/xsdconvert/converter.cc @@ -28,6 +28,8 @@ #include <unistd.h> // for using "getopt" function #include <sys/stat.h> +#include "converter.hh" + bool c_flag_used = false; int d_flag_used = 0; bool e_flag_used = false; diff --git a/xsdconvert/converter.hh b/xsdconvert/converter.hh new file mode 100644 index 000000000..ecd2fdfce --- /dev/null +++ b/xsdconvert/converter.hh @@ -0,0 +1,33 @@ +/****************************************************************************** + * Copyright (c) 2000-2017 Ericsson Telecom AB + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Szabo, Bence Janos + * + ******************************************************************************/ + +#ifndef CONVERTER_HH_ +#define CONVERTER_HH_ + +extern bool c_flag_used; +extern int d_flag_used; +extern bool e_flag_used; +extern bool f_flag_used; // also J flag +extern bool g_flag_used; +extern bool h_flag_used; +extern bool m_flag_used; +extern bool n_flag_used; // Undocumented. Internal use only with makefilegen +extern bool p_flag_used; +extern bool s_flag_used; +extern bool t_flag_used; +extern bool q_flag_used; +extern bool w_flag_used; +extern bool x_flag_used; +extern bool z_flag_used; + + +#endif /* CONVERTER_HH_ */ \ No newline at end of file -- GitLab