Skip to content

Fix warning: redefinition of typedef 'MPLndsets' [-Wpedantic] #21

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
ms609 wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Fix warning: redefinition of typedef 'MPLndsets' [-Wpedantic] #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31127ed
Fix warning: redefinition of typedef 'MPLndsets' [-Wpedantic]
Mar 15, 2018
f1f44a7
Define MPLndsets before first use
Mar 15, 2018
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
51 changes: 24 additions & 27 deletions src/morphydefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,30 @@ typedef unsigned int MPLstate;
#define MPLWTMIN (MPL_EPSILON * 10) /*! Safest (for me!) if calculations
steer pretty clear of epsilon */

typedef struct MPLndsets MPLndsets;

typedef struct MPLndsets {

bool updated;
int steps_to_recall;
MPLstate* downpass1;
MPLstate* uppass1;
MPLstate* downpass2;
MPLstate* uppass2;
MPLstate* subtree_actives;
MPLstate* temp_subtr_actives;
MPLstate* temp_downpass1;
MPLstate* temp_uppass1;
MPLstate* temp_downpass2;
MPLstate* temp_uppass2;
bool* changes;
char** downp1str;
char** downp2str;
char** upp1str;
char** upp2str;

} MPLndsets;


typedef struct partition_s MPLpartition;
// Evaluator function pointers
typedef int (*MPLdownfxn)
Expand Down Expand Up @@ -82,7 +105,6 @@ typedef struct {
} MPLcell;


typedef struct charinfo_s MPLcharinfo;
typedef struct charinfo_s {

int charindex;
Expand Down Expand Up @@ -112,7 +134,6 @@ typedef struct {
} MPLcupdate;


typedef struct partition_s MPLpartition;
typedef struct partition_s {

MPLchtype chtype; /*!< The optimality type used for this partition. */
Expand Down Expand Up @@ -150,30 +171,6 @@ typedef struct partition_s {
} MPLpartition;



typedef struct MPLndsets {

bool updated;
int steps_to_recall;
MPLstate* downpass1;
MPLstate* uppass1;
MPLstate* downpass2;
MPLstate* uppass2;
MPLstate* subtree_actives;
MPLstate* temp_subtr_actives;
MPLstate* temp_downpass1;
MPLstate* temp_uppass1;
MPLstate* temp_downpass2;
MPLstate* temp_uppass2;
bool* changes;
char** downp1str;
char** downp2str;
char** upp1str;
char** upp2str;

} MPLndsets;


typedef struct mpl_matrix_s {
int ncells;
MPLcell* cells;
Expand Down