bug fixing

[cdsspec-compiler.git] / src / edu / uci / eecs / specCompiler / codeGenerator / CodeVariables.java

diff --git a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
index 0e4a712e4c75e23c9794f11baa5a9b5057d44c02..c87e6883681c5196185fc1962a006bdc555cb514 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
+++ b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
@@ -179,7 +179,7 @@ public class CodeVariables {
        private static ArrayList<String> DEFINE_ID_FUNC(String interfaceName,
                        String idCode) {
                ArrayList<String> code = new ArrayList<String>();
-               code.add("static " + IDType + " " + interfaceName + "_id() {");
+               code.add("inline static " + IDType + " " + interfaceName + "_id() {");
                if (!idCode.equals("")) {
                        code.add(DECLARE_DEFINE(IDType, MACRO_ID, idCode));
                } else {
@@ -194,7 +194,7 @@ public class CodeVariables {
                        InterfaceConstruct construct, FunctionHeader header) {
                String interfaceName = construct.name;
                ArrayList<String> code = new ArrayList<String>();
-               code.add("static bool " + interfaceName + "_check_action(void *info, "
+               code.add("inline static bool " + interfaceName + "_check_action(void *info, "
                                + IDType + " " + MACRO_ID + ") {");
                code.add(DECLARE("bool", "check_passed"));
                // Read info struct
@@ -254,7 +254,7 @@ public class CodeVariables {
 
        private static void makeFunctionStatic(ArrayList<String> funcDefine) {
                String headLine = funcDefine.get(0);
-               headLine = "static " + headLine;
+               headLine = "inline static " + headLine;
                funcDefine.set(0, headLine);
        }
 
@@ -369,7 +369,7 @@ public class CodeVariables {
 
                newCode.add("");
                newCode.add(COMMENT("Define function for sequential code initialization"));
-               newCode.add("static void __sequential_init() {");
+               newCode.add("inline static void __sequential_init() {");
                // Init func_ptr_table
                newCode.add(COMMENT("Init func_ptr_table"));
                newCode.add(ASSIGN("func_ptr_table", "(void**) malloc(sizeof(void*) * "