From a777ec05f245cb502111a62294693efc3f1ef7fd Mon Sep 17 00:00:00 2001 From: Russell Standish Date: Thu, 8 Aug 2024 14:08:46 +1000 Subject: [PATCH] Builds now with new classdesc. --- classdesc | 2 +- graphcode | 2 +- include/ecolab_epilogue.h | 4 ++-- models/ecolab_model.cc | 1 - src/ecolab.cc | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/classdesc b/classdesc index 8dc3691..5ac87b1 160000 --- a/classdesc +++ b/classdesc @@ -1 +1 @@ -Subproject commit 8dc3691acdb7dff1b5be8f71025536d7db14cca3 +Subproject commit 5ac87b16643f6a2bd9ff3b72acb9aa2f398e654b diff --git a/graphcode b/graphcode index b4205ab..6600117 160000 --- a/graphcode +++ b/graphcode @@ -1 +1 @@ -Subproject commit b4205abf9fddd01dcb417b073b652e9ff83e456f +Subproject commit 660011790c421bdbf07eb95917f48756ec731612 diff --git a/include/ecolab_epilogue.h b/include/ecolab_epilogue.h index 33ca667..9c06f02 100644 --- a/include/ecolab_epilogue.h +++ b/include/ecolab_epilogue.h @@ -12,6 +12,6 @@ Put this after including all .cd files */ #include "classdesc_epilogue.h" -#ifdef TCL_OBJ_BASE_H -#include "TCL_obj_templates.h" +#ifdef GRAPHCODE_H +#include "graphcode.cd" #endif diff --git a/models/ecolab_model.cc b/models/ecolab_model.cc index 7d1bf38..491873f 100644 --- a/models/ecolab_model.cc +++ b/models/ecolab_model.cc @@ -22,7 +22,6 @@ using array_ns::pcoord; #include "pythonBuffer.h" #include "plot.h" -#include "object.cd" #include "ecolab_model.cd" #include "ecolab_epilogue.h" diff --git a/src/ecolab.cc b/src/ecolab.cc index 8505967..31f544e 100644 --- a/src/ecolab.cc +++ b/src/ecolab.cc @@ -11,7 +11,6 @@ #include "cairoSurfaceImage.h" #include "plot.h" #include "pythonBuffer.h" -#include "object.cd" #include "ecolab_epilogue.h" using namespace ecolab; using namespace std;