Skip to content

Commit

Permalink
move node_count typedef into CbcNodeInfo.hpp, fixes #628
Browse files Browse the repository at this point in the history
- CbcConfig.h doesn't get installed in this form, and thus the typedef
  was not available for installed Cbc libs
  • Loading branch information
svigerske committed Dec 13, 2023
1 parent 9340745 commit 782c933
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/CbcConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__*/
7 changes: 7 additions & 0 deletions src/CbcNodeInfo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 782c933

Please sign in to comment.