Skip to content

Commit

Permalink
updating version number in prep for release
Browse files Browse the repository at this point in the history
  • Loading branch information
markcmiller86 committed Oct 2, 2018
1 parent 075ff0c commit a2e4e3c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PROJECT(MACSIO)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)

SET(MACSIO_MAJOR_VERSION 1)
SET(MACSIO_MINOR_VERSION 0)
SET(MACSIO_MINOR_VERSION 1)
SET(MACSIO_PATCH_VERSION 0)
SET(MACSIO_VERSION
"${MACSIO_MAJOR_VERSION}.${MACSIO_MINOR_VERSION}.${MACSIO_PATCH_VERSION}")
Expand Down
7 changes: 4 additions & 3 deletions macsio/macsio_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,15 +287,16 @@ make_random_object_recurse(int nthings, int depth)
json_object *
MACSIO_DATA_MakeRandomObject(int nbytes)
{
json_object *first_attempt = make_random_object_recurse(nbytes, 0);
/*nbytes = first_attempt->*/
/*json_object *first_attempt = make_random_object_recurse(nbytes, 0); */
return 0;
}

json_object *
MACSIO_DATA_MakeRandomTable(int nbytes)
{
int divisor = random() % 10 + 1;
int nbytes_per_entry = random() % (nbytes / divisor) + 4;
return 0;
}

//#warning NEED TO REPLACE STRINGS WITH KEYS FOR MESH PARAMETERS
Expand Down Expand Up @@ -1297,4 +1298,4 @@ MACSIO_DATA_EvolveDataset(json_object *main_obj, int *dataset_evolved, float fac
json_object_array_add(vars_array, make_scalar_var(ndims, dims, bounds, centering, type, name));

return main_obj;
}
}

0 comments on commit a2e4e3c

Please sign in to comment.