Commit 1cffbd6d authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Fix some C++ issues.

parent d78af35b
...@@ -124,6 +124,8 @@ void *Splitsel(void *argument) ...@@ -124,6 +124,8 @@ void *Splitsel(void *argument)
} }
} }
int index = 0;
int nsets = 0;
/* offset */ /* offset */
for ( tsID = 0; tsID < noffset; tsID++ ) for ( tsID = 0; tsID < noffset; tsID++ )
...@@ -147,8 +149,6 @@ void *Splitsel(void *argument) ...@@ -147,8 +149,6 @@ void *Splitsel(void *argument)
} }
} }
int index = 0;
int nsets = 0;
while ( TRUE ) while ( TRUE )
{ {
sprintf(filename+nchars, "%06d", index); sprintf(filename+nchars, "%06d", index);
......
...@@ -51,7 +51,7 @@ double *fld_weights(int gridID, size_t ngp) ...@@ -51,7 +51,7 @@ double *fld_weights(int gridID, size_t ngp)
} }
int getLayerThickness(int genbounds, int index, int zaxisID, int nlev, double *thickness, double *weights); int getLayerThickness(bool genbounds, int index, int zaxisID, int nlev, double *thickness, double *weights);
double *vert_weights(int zaxisID, size_t nlev) double *vert_weights(int zaxisID, size_t nlev)
{ {
......
...@@ -288,7 +288,7 @@ void parse_json_buffer_to_pml(list_t *pml, size_t buffersize, char *buffer) ...@@ -288,7 +288,7 @@ void parse_json_buffer_to_pml(list_t *pml, size_t buffersize, char *buffer)
/* Allocate some tokens as a start */ /* Allocate some tokens as a start */
size_t tokcount = 2; size_t tokcount = 2;
jsmntok_t *tok = Malloc(sizeof(*tok) * tokcount); jsmntok_t *tok = (jsmntok_t *) Malloc(sizeof(*tok) * tokcount);
int r; int r;
AGAIN: AGAIN:
...@@ -298,7 +298,7 @@ void parse_json_buffer_to_pml(list_t *pml, size_t buffersize, char *buffer) ...@@ -298,7 +298,7 @@ void parse_json_buffer_to_pml(list_t *pml, size_t buffersize, char *buffer)
if ( r == JSMN_ERROR_NOMEM ) if ( r == JSMN_ERROR_NOMEM )
{ {
tokcount = tokcount * 2; tokcount = tokcount * 2;
tok = Realloc(tok, sizeof(*tok) * tokcount); tok = (jsmntok_t *) Realloc(tok, sizeof(*tok) * tokcount);
goto AGAIN; goto AGAIN;
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment