From 782c93392c0758bc8ba28a7169206e06e2ff1208 Mon Sep 17 00:00:00 2001 From: Stefan Vigerske Date: Wed, 13 Dec 2023 09:25:28 +0100 Subject: [PATCH] move node_count typedef into CbcNodeInfo.hpp, fixes #628 - CbcConfig.h doesn't get installed in this form, and thus the typedef was not available for installed Cbc libs --- src/CbcConfig.h | 6 ------ src/CbcNodeInfo.hpp | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/CbcConfig.h b/src/CbcConfig.h index 01615f901..7f2d8e44c 100644 --- a/src/CbcConfig.h +++ b/src/CbcConfig.h @@ -54,11 +54,5 @@ #endif #endif /* HAVE_CONFIG_H */ -// ints for some counts - which should really be long ints -#ifdef CBC_MANY_NODE_COUNTS -typedef long int node_count; -#else -typedef int node_count; -#endif #endif /*__CBCCONFIG_H__*/ diff --git a/src/CbcNodeInfo.hpp b/src/CbcNodeInfo.hpp index 8eeffc4d4..05fe8f3f8 100644 --- a/src/CbcNodeInfo.hpp +++ b/src/CbcNodeInfo.hpp @@ -27,6 +27,13 @@ class CbcNode; class CbcSubProblem; class CbcGeneralBranchingObject; +// ints for some counts - which should really be long ints +#ifdef CBC_MANY_NODE_COUNTS +typedef long int node_count; +#else +typedef int node_count; +#endif + //############################################################################# /** Information required to recreate the subproblem at this node