Merge "fixed self-ref check to no longer display errors for omit values (bug 498430)"

[deliverable/titan.core.git] / compiler2 / main.hh

diff --git a/compiler2/main.hh b/compiler2/main.hh
index 0beb371e600b9f2f861ab717547dd2abc5c7ad62..f9d554259a730d3c625b90af6ad2e587f56dd837 100644 (file)
--- a/compiler2/main.hh
+++ b/compiler2/main.hh
@@ -1,10 +1,23 @@
-///////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2000-2014 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
-///////////////////////////////////////////////////////////////////////////////
+/******************************************************************************
+ * Copyright (c) 2000-2016 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:
+ *   Baji, Laszlo
+ *   Balasko, Jeno
+ *   Baranyi, Botond
+ *   Delic, Adam
+ *   Forstner, Matyas
+ *   Kovacs, Ferenc
+ *   Kremer, Peter
+ *   Raduly, Csaba
+ *   Szabados, Kristof
+ *   Szabo, Janos Zoltan – initial implementation
+ *
+ ******************************************************************************/
 #ifndef MAIN_H
 #define MAIN_H
 
@@ -13,6 +26,7 @@ extern "C" {
 #endif
 
 #include "datatypes.h"
+#include "../common/memory.h"
 
 typedef struct tcov_file_list
 {
@@ -33,7 +47,10 @@ extern unsigned int nof_notupdated_files;
 extern boolean generate_skeleton, force_overwrite, include_line_info,
   include_location_info, duplicate_underscores, parse_only, semantic_check_only,
   output_only_linenum, default_as_optional, use_runtime_2, gcc_compat, asn1_xer,
-  check_subtype, suppress_context, enable_set_bound_out_param, display_up_to_date;
+  check_subtype, suppress_context, enable_set_bound_out_param, display_up_to_date,
+  implicit_json_encoding, json_refs_for_all_types, force_gen_seof,
+  omit_in_value_list, warnings_for_bad_variants, debugger_active,
+  legacy_unbound_union_fields;
 
 extern const char *expected_platform;