From dc52416aaa271ca374e00262567c30135346b350 Mon Sep 17 00:00:00 2001
From: Andrea Censi <andrea@cds.caltech.edu>
Date: Sat, 10 Apr 2010 03:30:13 +0000
Subject: [PATCH]
---
sm/CMakeLists.txt | 11 -----------
sm/lib/json-c/json_more_utils.c | 3 +++
sm/lib/json-c/json_more_utils.h | 1 +
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/sm/CMakeLists.txt b/sm/CMakeLists.txt
index 87a8818..afc1f3c 100644
--- a/sm/CMakeLists.txt
+++ b/sm/CMakeLists.txt
@@ -204,17 +204,6 @@ INSTALL(PROGRAMS hsm_test00 DESTINATION bin)
ENDIF(COMPILE_HSM)
-IF(COMPILE_STRUCTPRIOR)
-
-INCLUDE_DIRECTORIES(/sw/include)
-LINK_DIRECTORIES(/sw/lib)
-
-ADD_EXECUTABLE(structprior ./csm/structprior/structprior_test.cpp)
- TARGET_LINK_LIBRARIES(structprior csm-static)
-INSTALL(PROGRAMS structprior DESTINATION bin)
-
-ENDIF(COMPILE_STRUCTPRIOR)
-
SUBDIRS(pkg-config)
diff --git a/sm/lib/json-c/json_more_utils.c b/sm/lib/json-c/json_more_utils.c
index 09ea398..d714daf 100644
--- a/sm/lib/json-c/json_more_utils.c
+++ b/sm/lib/json-c/json_more_utils.c
@@ -257,6 +257,9 @@ int jo_read_int(JO jo, const char*name, int*p) {
double convert_to_double(JO jo) {
if(json_object_is_type(jo, (enum json_type) json_type_double))
return json_object_get_double(jo);
+ else if(json_object_is_type(jo, (enum json_type) json_type_int)) {
+ return json_object_get_int(jo);
+ }
else
return NAN;
}
diff --git a/sm/lib/json-c/json_more_utils.h b/sm/lib/json-c/json_more_utils.h
index 2fc6c6a..385ed81 100644
--- a/sm/lib/json-c/json_more_utils.h
+++ b/sm/lib/json-c/json_more_utils.h
@@ -44,6 +44,7 @@ void jo_add_string (JO parent, const char*name, const char*v);
/** Return 0 if there isn't a field called 'name' */
int jo_read_int (JO parent, const char*name, int*p) ;
+/** This also tolerates an integer */
int jo_read_double (JO parent, const char*name, double*p);
/* Returns 0 if there isn't a field called "name", or it's not an array, or
--
GitLab