From d60601d9b5a8c30cda3a2a582acb9884c7549f85 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Wed, 28 Sep 2016 14:47:42 -0500 Subject: [PATCH] Variable Server could not find variable related to trick_sys.sched #315 Added a "-n" argument when calling ICG on Trick core. I had previously removed the "friend attr" lines from Trick core classes. The -n argument instructs ICG to not create the offsetof calls that require the friend function and to process protected and private variables by default. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dcba0263..e7f3663c 100644 --- a/Makefile +++ b/Makefile @@ -193,7 +193,7 @@ endif # header files. .PHONY: icg_sim_serv icg_sim_serv: $(ICG_EXE) - ${TRICK_HOME}/bin/trick-ICG -s -m ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh + ${TRICK_HOME}/bin/trick-ICG -s -m -n ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh # 1.1.1.4.1 Build the Interface Code Generator (ICG) executable. $(ICG_EXE) : @@ -387,7 +387,7 @@ uninstall: # ICG all sim_services files (for testing and debugging ICG). # The -f flag forces io_src files to be regenerated whether or not they need to be. ICG: $(ICG_EXE) - ${TRICK_HOME}/bin/trick-ICG -f -s -m ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh + ${TRICK_HOME}/bin/trick-ICG -f -s -m -n ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh # This builds a tricklib share library. trick_lib: $(SIM_SERV_DIRS) $(UTILS_DIRS) | $(TRICK_LIB_DIR)