From a2e4e3ce415594ad87a039e0bd2f07549dbf0f8c Mon Sep 17 00:00:00 2001 From: miller86 Date: Tue, 2 Oct 2018 10:56:16 -0700 Subject: [PATCH] updating version number in prep for release --- CMakeLists.txt | 2 +- macsio/macsio_data.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b4dc08..87b9e82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") diff --git a/macsio/macsio_data.c b/macsio/macsio_data.c index f5108ed..c8fb270 100644 --- a/macsio/macsio_data.c +++ b/macsio/macsio_data.c @@ -287,8 +287,8 @@ 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 * @@ -296,6 +296,7 @@ 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 @@ -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; -} \ No newline at end of file +}