Skip to content

Commit

Permalink
use int instead of bool in c-api for wider compat (#171)
Browse files Browse the repository at this point in the history 
changes all instances of bool to in in the c-api
for conduit + blueprint.

bool is in C99, but requires include of stdbool.h
using int instead of bool will make c-api easier
to use on a wider set of compilers.
  • Loading branch information
@cyrush
cyrush committed May 31, 2017
1 parent bd2583c commit a3f61ce
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 64 deletions.
6 changes: 3 additions & 3 deletions src/libs/blueprint/c/conduit_blueprint.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ CONDUIT_BLUEPRINT_API void conduit_blueprint_about(conduit_node *cnode);
/// Verify passed node confirms to given blueprint protocol.
/// Messages related to the verification are be placed in the "info" node.
//-----------------------------------------------------------------------------
CONDUIT_BLUEPRINT_API bool conduit_blueprint_verify(const char *protocol,
const conduit_node *cnode,
conduit_node *cinfo);
CONDUIT_BLUEPRINT_API int conduit_blueprint_verify(const char *protocol,
const conduit_node *cnode,
conduit_node *cinfo);

#ifdef __cplusplus
}
Expand Down
4 changes: 2 additions & 2 deletions src/libs/blueprint/c/conduit_blueprint_c.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ conduit_blueprint_about(conduit_node *cnode)


//-----------------------------------------------------------------------------
bool
int
conduit_blueprint_verify(const char *protocol,
const conduit_node *cnode,
conduit_node *cinfo)
{
const Node *n = cpp_node(cnode);
Node *info = cpp_node(cinfo);
return blueprint::verify(std::string(protocol),*n,*info);
return (int)blueprint::verify(std::string(protocol),*n,*info);
}

}
Expand Down
20 changes: 10 additions & 10 deletions src/libs/blueprint/c/conduit_blueprint_mcarray.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,27 +73,27 @@ extern "C" {
//-----------------------------------------------------------------------------
/// Verify passed node confirms to the blueprint mcarray protocol.
//-----------------------------------------------------------------------------
CONDUIT_BLUEPRINT_API bool conduit_blueprint_mcarray_verify(const conduit_node *cnode,
conduit_node *cinfo);
CONDUIT_BLUEPRINT_API int conduit_blueprint_mcarray_verify(const conduit_node *cnode,
conduit_node *cinfo);


//-----------------------------------------------------------------------------
/// Verify passed node confirms to given blueprint mcarray sub protocol.
//-----------------------------------------------------------------------------
CONDUIT_BLUEPRINT_API bool conduit_blueprint_mcarray_verify_sub_protocol(const char *protocol,
const conduit_node *cnode,
conduit_node *cinfo);
CONDUIT_BLUEPRINT_API int conduit_blueprint_mcarray_verify_sub_protocol(const char *protocol,
const conduit_node *cnode,
conduit_node *cinfo);

//----------------------------------------------------------------------------
CONDUIT_BLUEPRINT_API bool conduit_blueprint_mcarray_is_interleaved(const conduit_node *cnode);
CONDUIT_BLUEPRINT_API int conduit_blueprint_mcarray_is_interleaved(const conduit_node *cnode);

//----------------------------------------------------------------------------
CONDUIT_BLUEPRINT_API bool conduit_blueprint_mcarray_to_contiguous(const conduit_node *cnode,
conduit_node *cdest);
CONDUIT_BLUEPRINT_API int conduit_blueprint_mcarray_to_contiguous(const conduit_node *cnode,
conduit_node *cdest);

//-----------------------------------------------------------------------------
CONDUIT_BLUEPRINT_API bool conduit_blueprint_mcarray_to_interleaved(const conduit_node *cnode,
conduit_node *cdest);
CONDUIT_BLUEPRINT_API int conduit_blueprint_mcarray_to_interleaved(const conduit_node *cnode,
conduit_node *cdest);

//-----------------------------------------------------------------------------
/// Interface to generate example mesh blueprint data.
Expand Down
20 changes: 10 additions & 10 deletions src/libs/blueprint/c/conduit_blueprint_mcarray_c.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,56 +66,56 @@ using namespace conduit;
//-----------------------------------------------------------------------------
/// Verify passed node confirms to the blueprint mcarray protocol.
//-----------------------------------------------------------------------------
bool
int
conduit_blueprint_mcarray_verify(const conduit_node *cnode,
conduit_node *cinfo)
{
const Node &n = cpp_node_ref(cnode);
Node &info = cpp_node_ref(cinfo);
return blueprint::mcarray::verify(n,info);
return (int)blueprint::mcarray::verify(n,info);
}


//-----------------------------------------------------------------------------
/// Verify passed node confirms to given blueprint mcarray sub protocol.
//-----------------------------------------------------------------------------
bool
int
conduit_blueprint_mcarray_verify_sub_protocol(const char *protocol,
const conduit_node *cnode,
conduit_node *cinfo)
{
const Node &n = cpp_node_ref(cnode);
Node &info = cpp_node_ref(cinfo);
return blueprint::mcarray::verify(std::string(protocol),n,info);
return (int)blueprint::mcarray::verify(std::string(protocol),n,info);
}


//----------------------------------------------------------------------------
bool
int
conduit_blueprint_mcarray_is_interleaved(const conduit_node *cnode)
{
const Node &n = cpp_node_ref(cnode);
return blueprint::mcarray::is_interleaved(n);
return (int)blueprint::mcarray::is_interleaved(n);
}

//-----------------------------------------------------------------------------
bool
int
conduit_blueprint_mcarray_to_contiguous(const conduit_node *cnode,
conduit_node *cdest)
{
const Node &n = cpp_node_ref(cnode);
Node &dest = cpp_node_ref(cdest);
return blueprint::mcarray::to_contiguous(n,dest);
return (int)blueprint::mcarray::to_contiguous(n,dest);
}

//-----------------------------------------------------------------------------
bool
int
conduit_blueprint_mcarray_to_interleaved(const conduit_node *cnode,
conduit_node *cdest)
{
const Node &n = cpp_node_ref(cnode);
Node &dest = cpp_node_ref(cdest);
return blueprint::mcarray::to_interleaved(n,dest);
return (int)blueprint::mcarray::to_interleaved(n,dest);
}


Expand Down
10 changes: 5 additions & 5 deletions src/libs/blueprint/c/conduit_blueprint_mesh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,16 @@ extern "C" {
//-----------------------------------------------------------------------------
/// Verify passed node confirms to the blueprint mesh protocol.
//-----------------------------------------------------------------------------
CONDUIT_BLUEPRINT_API bool conduit_blueprint_mesh_verify(const conduit_node *cnode,
conduit_node *cinfo);
CONDUIT_BLUEPRINT_API int conduit_blueprint_mesh_verify(const conduit_node *cnode,
conduit_node *cinfo);


//-----------------------------------------------------------------------------
/// Verify passed node confirms to given blueprint mesh sub protocol.
//-----------------------------------------------------------------------------
CONDUIT_BLUEPRINT_API bool conduit_blueprint_mesh_verify_sub_protocol(const char *protocol,
const conduit_node *cnode,
conduit_node *cinfo);
CONDUIT_BLUEPRINT_API int conduit_blueprint_mesh_verify_sub_protocol(const char *protocol,
const conduit_node *cnode,
conduit_node *cinfo);

//-----------------------------------------------------------------------------
/// Generate mesh::index from valid mesh.
Expand Down
8 changes: 4 additions & 4 deletions src/libs/blueprint/c/conduit_blueprint_mesh_c.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,27 +66,27 @@ using namespace conduit;
//-----------------------------------------------------------------------------
/// Verify passed node confirms to the blueprint mesh protocol.
//-----------------------------------------------------------------------------
bool
int
conduit_blueprint_mesh_verify(const conduit_node *cnode,
conduit_node *cinfo)
{
const Node &n = cpp_node_ref(cnode);
Node &info = cpp_node_ref(cinfo);
return blueprint::mesh::verify(n,info);
return (int)blueprint::mesh::verify(n,info);
}


//-----------------------------------------------------------------------------
/// Verify passed node confirms to given blueprint mesh sub protocol.
//-----------------------------------------------------------------------------
bool
int
conduit_blueprint_mesh_verify_sub_protocol(const char *protocol,
const conduit_node *cnode,
conduit_node *cinfo)
{
const Node &n = cpp_node_ref(cnode);
Node &info = cpp_node_ref(cinfo);
return blueprint::mesh::verify(std::string(protocol),n,info);
return (int)blueprint::mesh::verify(std::string(protocol),n,info);
}


Expand Down
28 changes: 14 additions & 14 deletions src/libs/conduit/c/conduit_node.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,18 @@ CONDUIT_API conduit_index_t conduit_node_number_of_elements(conduit_node *cnode)
// CONDUIT_API char *conduit_node_path(const conduit_node *cnode);

//-----------------------------------------------------------------------------
CONDUIT_API bool conduit_node_has_child(const conduit_node *cnode,
const char *name);
CONDUIT_API bool conduit_node_has_path(const conduit_node *cnode,
const char *path);
CONDUIT_API int conduit_node_has_child(const conduit_node *cnode,
const char *name);
CONDUIT_API int conduit_node_has_path(const conduit_node *cnode,
const char *path);

//-----------------------------------------------------------------------------
// -- node info --
//-----------------------------------------------------------------------------

//-----------------------------------------------------------------------------
CONDUIT_API bool conduit_node_is_root(conduit_node *cnode);
CONDUIT_API bool conduit_node_is_data_external(const conduit_node *cnode);
CONDUIT_API int conduit_node_is_root(conduit_node *cnode);
CONDUIT_API int conduit_node_is_data_external(const conduit_node *cnode);

//-----------------------------------------------------------------------------
CONDUIT_API conduit_node *conduit_node_parent(conduit_node *cnode);
Expand All @@ -130,18 +130,18 @@ CONDUIT_API conduit_index_t conduit_node_total_strided_bytes(const conduit_node
CONDUIT_API conduit_index_t conduit_node_total_bytes_compact(const conduit_node *cnode);

//-----------------------------------------------------------------------------
CONDUIT_API bool conduit_node_is_compact(const conduit_node *cnode);
CONDUIT_API int conduit_node_is_compact(const conduit_node *cnode);

//-----------------------------------------------------------------------------
CONDUIT_API bool conduit_node_is_contiguous(const conduit_node *cnode);
CONDUIT_API bool conduit_node_contiguous_with_node(const conduit_node *cnode,
const conduit_node *cother);
CONDUIT_API bool conduit_node_contiguous_with_address(const conduit_node *cnode,
void *address);
CONDUIT_API int conduit_node_is_contiguous(const conduit_node *cnode);
CONDUIT_API int conduit_node_contiguous_with_node(const conduit_node *cnode,
const conduit_node *cother);
CONDUIT_API int conduit_node_contiguous_with_address(const conduit_node *cnode,
void *address);

//-----------------------------------------------------------------------------
CONDUIT_API bool conduit_node_compatible(const conduit_node *cnode,
const conduit_node *cother);
CONDUIT_API int conduit_node_compatible(const conduit_node *cnode,
const conduit_node *cother);

CONDUIT_API void conduit_node_info(const conduit_node *cnode,
const conduit_node *cnres);
Expand Down
32 changes: 16 additions & 16 deletions src/libs/conduit/c/conduit_node_c.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,33 +123,33 @@ conduit_node_number_of_elements(conduit_node *cnode)
}

//-----------------------------------------------------------------------------
bool
int
conduit_node_has_child(const conduit_node *cnode,
const char *name)
{
return cpp_node(cnode)->has_child(std::string(name));
return (int)cpp_node(cnode)->has_child(std::string(name));
}

//-----------------------------------------------------------------------------
bool
int
conduit_node_has_path(const conduit_node *cnode,
const char *path)
{
return cpp_node(cnode)->has_path(std::string(path));
return (int)cpp_node(cnode)->has_path(std::string(path));
}

//-----------------------------------------------------------------------------
bool
int
conduit_node_is_root(conduit_node *cnode)
{
return cpp_node(cnode)->is_root();
return (int)cpp_node(cnode)->is_root();
}

//-----------------------------------------------------------------------------
bool
int
conduit_node_is_data_external(const conduit_node *cnode)
{
return cpp_node(cnode)->is_data_external();
return (int)cpp_node(cnode)->is_data_external();
}


Expand All @@ -175,33 +175,33 @@ conduit_node_total_bytes_compact(const conduit_node *cnode)
}

//-----------------------------------------------------------------------------
bool
int
conduit_node_is_compact(const conduit_node *cnode)
{
return cpp_node(cnode)->is_compact();
return (int)cpp_node(cnode)->is_compact();
}

//-----------------------------------------------------------------------------
bool
int
conduit_node_is_contiguous(const conduit_node *cnode)
{
return cpp_node(cnode)->is_contiguous();
return (int)cpp_node(cnode)->is_contiguous();
}

//-----------------------------------------------------------------------------
bool
int
conduit_node_contiguous_with_node(const conduit_node *cnode,
const conduit_node *cother)
{
return cpp_node(cnode)->contiguous_with(cpp_node_ref(cother));
return (int)cpp_node(cnode)->contiguous_with(cpp_node_ref(cother));
}

//-----------------------------------------------------------------------------
bool
int
conduit_node_contiguous_with_address(const conduit_node *cnode,
void *address)
{
return cpp_node(cnode)->contiguous_with(address);
return (int)cpp_node(cnode)->contiguous_with(address);
}

//-----------------------------------------------------------------------------
Expand Down

0 comments on commit a3f61ce

Please sign in to comment.