Skip to content

C++17 fixes #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

C++17 fixes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1a0263
fixed BOOL_MAX define overlap
chruffins Jan 31, 2024
93e074f
fixed overlap with C++17 std::size
chruffins Jan 31, 2024
7c169cf
register is deprecated in C++ (and compilers ignore it in C)
chruffins Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions include/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,13 @@ enum {
extern const char * opnames[EQU_BASE];
#define XNOR 6 //XNOR and EQU are the same function

#define BOOL_FALSE 0
#define BOOL_TRUE 1
#define BOOL_UNKNOWN 2
#define BOOL_MAX 3
/* fixing a wall of compiler warnings from redefining BOOL_MAX */
enum SBSAT_BOOL {
BOOL_FALSE = 0,
BOOL_TRUE = 1,
BOOL_UNKNOWN = 2,
BOOL_ENUM_MAX = 3
};

/* various stacks */
#define LEVEL_START -1
Expand Down
16 changes: 8 additions & 8 deletions src/formats/5/x/libt5_la-iscas_g.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ union yyalloc
# define YYCOPY(To, From, Count) \
do \
{ \
register YYSIZE_T yyi; \
YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
Expand Down Expand Up @@ -551,7 +551,7 @@ yystrlen (yystr)
const char *yystr;
# endif
{
register const char *yys = yystr;
const char *yys = yystr;

while (*yys++ != '\0')
continue;
Expand All @@ -576,8 +576,8 @@ yystpcpy (yydest, yysrc)
const char *yysrc;
# endif
{
register char *yyd = yydest;
register const char *yys = yysrc;
char *yyd = yydest;
const char *yys = yysrc;

while ((*yyd++ = *yys++) != '\0')
continue;
Expand Down Expand Up @@ -698,8 +698,8 @@ yyparse (YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
{

register int yystate;
register int yyn;
int yystate;
int yyn;
int yyresult;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
Expand All @@ -717,12 +717,12 @@ yyparse (YYPARSE_PARAM_ARG)
/* The state stack. */
short yyssa[YYINITDEPTH];
short *yyss = yyssa;
register short *yyssp;
short *yyssp;

/* The semantic value stack. */
YYSTYPE yyvsa[YYINITDEPTH];
YYSTYPE *yyvs = yyvsa;
register YYSTYPE *yyvsp;
YYSTYPE *yyvsp;



Expand Down
16 changes: 8 additions & 8 deletions src/formats/5/x/libt5_la-prover3_g.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ union yyalloc
# define YYCOPY(To, From, Count) \
do \
{ \
register YYSIZE_T yyi; \
YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
Expand Down Expand Up @@ -531,7 +531,7 @@ yystrlen (yystr)
const char *yystr;
# endif
{
register const char *yys = yystr;
const char *yys = yystr;

while (*yys++ != '\0')
continue;
Expand All @@ -556,8 +556,8 @@ yystpcpy (yydest, yysrc)
const char *yysrc;
# endif
{
register char *yyd = yydest;
register const char *yys = yysrc;
char *yyd = yydest;
const char *yys = yysrc;

while ((*yyd++ = *yys++) != '\0')
continue;
Expand Down Expand Up @@ -678,8 +678,8 @@ yyparse (YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
{

register int yystate;
register int yyn;
int yystate;
int yyn;
int yyresult;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
Expand All @@ -697,12 +697,12 @@ yyparse (YYPARSE_PARAM_ARG)
/* The state stack. */
short yyssa[YYINITDEPTH];
short *yyss = yyssa;
register short *yyssp;
short *yyssp;

/* The semantic value stack. */
YYSTYPE yyvsa[YYINITDEPTH];
YYSTYPE *yyvs = yyvsa;
register YYSTYPE *yyvsp;
YYSTYPE *yyvsp;



Expand Down
16 changes: 8 additions & 8 deletions src/formats/5/x/libt5_la-prover_g.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ union yyalloc
# define YYCOPY(To, From, Count) \
do \
{ \
register YYSIZE_T yyi; \
YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
Expand Down Expand Up @@ -545,7 +545,7 @@ yystrlen (yystr)
const char *yystr;
# endif
{
register const char *yys = yystr;
const char *yys = yystr;

while (*yys++ != '\0')
continue;
Expand All @@ -570,8 +570,8 @@ yystpcpy (yydest, yysrc)
const char *yysrc;
# endif
{
register char *yyd = yydest;
register const char *yys = yysrc;
char *yyd = yydest;
const char *yys = yysrc;

while ((*yyd++ = *yys++) != '\0')
continue;
Expand Down Expand Up @@ -692,8 +692,8 @@ yyparse (YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
{

register int yystate;
register int yyn;
int yystate;
int yyn;
int yyresult;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
Expand All @@ -711,12 +711,12 @@ yyparse (YYPARSE_PARAM_ARG)
/* The state stack. */
short yyssa[YYINITDEPTH];
short *yyss = yyssa;
register short *yyssp;
short *yyssp;

/* The semantic value stack. */
YYSTYPE yyvsa[YYINITDEPTH];
YYSTYPE *yyvs = yyvsa;
register YYSTYPE *yyvsp;
YYSTYPE *yyvsp;



Expand Down
6 changes: 3 additions & 3 deletions src/preproc/do_prover3.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
#include "sbsat.h"
#include "sbsat_preproc.h"

int size = 10;
int do_prover3_size = 10;

int Do_Prover3() {
if(formatin != '3') return PREP_NO_CHANGE;
dX_printf(3, "RECOMPUTING PROVER %d - \n", size);
dX_printf(3, "RECOMPUTING PROVER %d - \n", do_prover3_size);
str_length = 0;
bool OLD_DO_INFERENCES = DO_INFERENCES;
DO_INFERENCES = 0;
Expand Down Expand Up @@ -85,7 +85,7 @@ int Do_Prover3() {

//Grabbing new prover3 BDDS
nmbrFunctions = 0;
prover3_max_vars = size;
prover3_max_vars = do_prover3_size;
void p3_done();
p3_done();

Expand Down
2 changes: 1 addition & 1 deletion src/solv_smurf/fn_minmax/bt_specfn_minmax.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ InferNLits_MINMAX(int nFnId, int nNumRHSUnknowns, int value)
{
int nNumElts = arrSolverFunctions[nFnId].fn_minmax.rhsVbles.nNumElts;
int *arrElts = arrSolverFunctions[nFnId].fn_minmax.rhsVbles.arrElts;
int arrNewPolar[BOOL_MAX];
int arrNewPolar[BOOL_ENUM_MAX];
if (value == BOOL_TRUE) {
arrNewPolar[BOOL_TRUE] = BOOL_TRUE;
arrNewPolar[BOOL_FALSE] = BOOL_FALSE;
Expand Down
2 changes: 1 addition & 1 deletion src/solver/bt_specfn_minmax.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ InferNLits_MINMAX(SpecialFunc *pSpecialFunc, int nNumRHSUnknowns, int value)
{
int nNumElts = pSpecialFunc->rhsVbles.nNumElts;
int *arrElts = pSpecialFunc->rhsVbles.arrElts;
int arrNewPolar[BOOL_MAX];
int arrNewPolar[BOOL_ENUM_MAX];
if (value == BOOL_TRUE) {
arrNewPolar[BOOL_TRUE] = BOOL_TRUE;
arrNewPolar[BOOL_FALSE] = BOOL_FALSE;
Expand Down