No commit message

No commit message

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)
 

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;
 }

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