Skip to content

Commit

Permalink
Remove library uses of std::endl on std::cerr (#542)
Browse files Browse the repository at this point in the history 
* Remove library uses of std::endl on std::cerr

There is no need to flush cerr.

https://en.cppreference.com/w/cpp/io/cerr
https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#Rio-endl
  • Loading branch information
@jwnimmer-tri
jwnimmer-tri authored Jun 9, 2021
1 parent 50fb18d commit 7fcdc7f
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 55 deletions.
74 changes: 37 additions & 37 deletions include/fcl/geometry/bvh/BVH_model-inl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,21 +228,21 @@ int BVHModel<BV>::beginModel(int num_tris_, int num_vertices_)
tri_indices = new(std::nothrow) Triangle[num_tris_allocated];
if(!tri_indices)
{
std::cerr << "BVH Error! Out of memory for tri_indices array on BeginModel() call!" << std::endl;
std::cerr << "BVH Error! Out of memory for tri_indices array on BeginModel() call!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}
}

vertices = new Vector3<S>[num_vertices_allocated];
if(!vertices)
{
std::cerr << "BVH Error! Out of memory for vertices array on BeginModel() call!" << std::endl;
std::cerr << "BVH Error! Out of memory for vertices array on BeginModel() call!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}

if(build_state != BVH_BUILD_STATE_EMPTY)
{
std::cerr << "BVH Warning! Call beginModel() on a BVHModel that is not empty. This model was cleared and previous triangles/vertices were lost." << std::endl;
std::cerr << "BVH Warning! Call beginModel() on a BVHModel that is not empty. This model was cleared and previous triangles/vertices were lost.\n";
build_state = BVH_BUILD_STATE_EMPTY;
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}
Expand All @@ -258,7 +258,7 @@ int BVHModel<BV>::addVertex(const Vector3<S>& p)
{
if(build_state != BVH_BUILD_STATE_BEGUN)
{
std::cerr << "BVH Warning! Call addVertex() in a wrong order. addVertex() was ignored. Must do a beginModel() to clear the model for addition of new vertices." << std::endl;
std::cerr << "BVH Warning! Call addVertex() in a wrong order. addVertex() was ignored. Must do a beginModel() to clear the model for addition of new vertices.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

Expand All @@ -267,7 +267,7 @@ int BVHModel<BV>::addVertex(const Vector3<S>& p)
Vector3<S>* temp = new Vector3<S>[num_vertices_allocated * 2];
if(!temp)
{
std::cerr << "BVH Error! Out of memory for vertices array on addVertex() call!" << std::endl;
std::cerr << "BVH Error! Out of memory for vertices array on addVertex() call!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}

Expand All @@ -289,7 +289,7 @@ int BVHModel<BV>::addTriangle(const Vector3<S>& p1, const Vector3<S>& p2, const
{
if(build_state == BVH_BUILD_STATE_PROCESSED)
{
std::cerr << "BVH Warning! Call addTriangle() in a wrong order. addTriangle() was ignored. Must do a beginModel() to clear the model for addition of new triangles." << std::endl;
std::cerr << "BVH Warning! Call addTriangle() in a wrong order. addTriangle() was ignored. Must do a beginModel() to clear the model for addition of new triangles.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

Expand All @@ -298,7 +298,7 @@ int BVHModel<BV>::addTriangle(const Vector3<S>& p1, const Vector3<S>& p2, const
Vector3<S>* temp = new Vector3<S>[num_vertices_allocated * 2 + 2];
if(!temp)
{
std::cerr << "BVH Error! Out of memory for vertices array on addTriangle() call!" << std::endl;
std::cerr << "BVH Error! Out of memory for vertices array on addTriangle() call!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}

Expand Down Expand Up @@ -326,7 +326,7 @@ int BVHModel<BV>::addTriangle(const Vector3<S>& p1, const Vector3<S>& p2, const
Triangle* temp = new Triangle[num_tris_allocated * 2];
if(!temp)
{
std::cerr << "BVH Error! Out of memory for tri_indices array on addTriangle() call!" << std::endl;
std::cerr << "BVH Error! Out of memory for tri_indices array on addTriangle() call!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}

Expand All @@ -348,7 +348,7 @@ int BVHModel<BV>::addSubModel(const std::vector<Vector3<S>>& ps)
{
if(build_state == BVH_BUILD_STATE_PROCESSED)
{
std::cerr << "BVH Warning! Call addSubModel() in a wrong order. addSubModel() was ignored. Must do a beginModel() to clear the model for addition of new vertices." << std::endl;
std::cerr << "BVH Warning! Call addSubModel() in a wrong order. addSubModel() was ignored. Must do a beginModel() to clear the model for addition of new vertices.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

Expand All @@ -359,7 +359,7 @@ int BVHModel<BV>::addSubModel(const std::vector<Vector3<S>>& ps)
Vector3<S>* temp = new Vector3<S>[num_vertices_allocated * 2 + num_vertices_to_add - 1];
if(!temp)
{
std::cerr << "BVH Error! Out of memory for vertices array on addSubModel() call!" << std::endl;
std::cerr << "BVH Error! Out of memory for vertices array on addSubModel() call!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}

Expand All @@ -384,7 +384,7 @@ int BVHModel<BV>::addSubModel(const std::vector<Vector3<S>>& ps, const std::vect
{
if(build_state == BVH_BUILD_STATE_PROCESSED)
{
std::cerr << "BVH Warning! Call addSubModel() in a wrong order. addSubModel() was ignored. Must do a beginModel() to clear the model for addition of new vertices." << std::endl;
std::cerr << "BVH Warning! Call addSubModel() in a wrong order. addSubModel() was ignored. Must do a beginModel() to clear the model for addition of new vertices.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

Expand All @@ -395,7 +395,7 @@ int BVHModel<BV>::addSubModel(const std::vector<Vector3<S>>& ps, const std::vect
Vector3<S>* temp = new Vector3<S>[num_vertices_allocated * 2 + num_vertices_to_add - 1];
if(!temp)
{
std::cerr << "BVH Error! Out of memory for vertices array on addSubModel() call!" << std::endl;
std::cerr << "BVH Error! Out of memory for vertices array on addSubModel() call!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}

Expand Down Expand Up @@ -425,7 +425,7 @@ int BVHModel<BV>::addSubModel(const std::vector<Vector3<S>>& ps, const std::vect
Triangle* temp = new(std::nothrow) Triangle[num_tris_allocated * 2 + num_tris_to_add - 1];
if(!temp)
{
std::cerr << "BVH Error! Out of memory for tri_indices array on addSubModel() call!" << std::endl;
std::cerr << "BVH Error! Out of memory for tri_indices array on addSubModel() call!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}

Expand All @@ -451,13 +451,13 @@ int BVHModel<BV>::endModel()
{
if(build_state != BVH_BUILD_STATE_BEGUN)
{
std::cerr << "BVH Warning! Call endModel() in wrong order. endModel() was ignored." << std::endl;
std::cerr << "BVH Warning! Call endModel() in wrong order. endModel() was ignored.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

if(num_tris == 0 && num_vertices == 0)
{
std::cerr << "BVH Error! endModel() called on model with no triangles and vertices." << std::endl;
std::cerr << "BVH Error! endModel() called on model with no triangles and vertices.\n";
return BVH_ERR_BUILD_EMPTY_MODEL;
}

Expand All @@ -466,7 +466,7 @@ int BVHModel<BV>::endModel()
Triangle* new_tris = new(std::nothrow) Triangle[num_tris];
if(!new_tris)
{
std::cerr << "BVH Error! Out of memory for tri_indices array in endModel() call!" << std::endl;
std::cerr << "BVH Error! Out of memory for tri_indices array in endModel() call!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}
std::copy(tri_indices, tri_indices + num_tris, new_tris);
Expand All @@ -480,7 +480,7 @@ int BVHModel<BV>::endModel()
Vector3<S>* new_vertices = new Vector3<S>[num_vertices];
if(!new_vertices)
{
std::cerr << "BVH Error! Out of memory for vertices array in endModel() call!" << std::endl;
std::cerr << "BVH Error! Out of memory for vertices array in endModel() call!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}
std::copy(vertices, vertices + num_vertices, new_vertices);
Expand All @@ -502,7 +502,7 @@ int BVHModel<BV>::endModel()
primitive_indices = new(std::nothrow) unsigned int [num_bvs_to_be_allocated];
if(!bvs || !primitive_indices)
{
std::cerr << "BVH Error! Out of memory for BV array in endModel()!" << std::endl;
std::cerr << "BVH Error! Out of memory for BV array in endModel()!\n";
return BVH_ERR_MODEL_OUT_OF_MEMORY;
}
num_bvs_allocated = num_bvs_to_be_allocated;
Expand All @@ -522,7 +522,7 @@ int BVHModel<BV>::beginReplaceModel()
{
if(build_state != BVH_BUILD_STATE_PROCESSED)
{
std::cerr << "BVH Error! Call beginReplaceModel() on a BVHModel that has no previous frame." << std::endl;
std::cerr << "BVH Error! Call beginReplaceModel() on a BVHModel that has no previous frame.\n";
return BVH_ERR_BUILD_EMPTY_PREVIOUS_FRAME;
}

Expand All @@ -545,7 +545,7 @@ int BVHModel<BV>::replaceVertex(const Vector3<S>& p)
{
if(build_state != BVH_BUILD_STATE_REPLACE_BEGUN)
{
std::cerr << "BVH Warning! Call replaceVertex() in a wrong order. replaceVertex() was ignored. Must do a beginReplaceModel() for initialization." << std::endl;
std::cerr << "BVH Warning! Call replaceVertex() in a wrong order. replaceVertex() was ignored. Must do a beginReplaceModel() for initialization.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

Expand All @@ -561,7 +561,7 @@ int BVHModel<BV>::replaceTriangle(const Vector3<S>& p1, const Vector3<S>& p2, co
{
if(build_state != BVH_BUILD_STATE_REPLACE_BEGUN)
{
std::cerr << "BVH Warning! Call replaceTriangle() in a wrong order. replaceTriangle() was ignored. Must do a beginReplaceModel() for initialization." << std::endl;
std::cerr << "BVH Warning! Call replaceTriangle() in a wrong order. replaceTriangle() was ignored. Must do a beginReplaceModel() for initialization.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

Expand All @@ -577,7 +577,7 @@ int BVHModel<BV>::replaceSubModel(const std::vector<Vector3<S>>& ps)
{
if(build_state != BVH_BUILD_STATE_REPLACE_BEGUN)
{
std::cerr << "BVH Warning! Call replaceSubModel() in a wrong order. replaceSubModel() was ignored. Must do a beginReplaceModel() for initialization." << std::endl;
std::cerr << "BVH Warning! Call replaceSubModel() in a wrong order. replaceSubModel() was ignored. Must do a beginReplaceModel() for initialization.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

Expand All @@ -595,13 +595,13 @@ int BVHModel<BV>::endReplaceModel(bool refit, bool bottomup)
{
if(build_state != BVH_BUILD_STATE_REPLACE_BEGUN)
{
std::cerr << "BVH Warning! Call endReplaceModel() in a wrong order. endReplaceModel() was ignored. " << std::endl;
std::cerr << "BVH Warning! Call endReplaceModel() in a wrong order. endReplaceModel() was ignored. \n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

if(num_vertex_updated != num_vertices)
{
std::cerr << "BVH Error! The replaced model should have the same number of vertices as the old model." << std::endl;
std::cerr << "BVH Error! The replaced model should have the same number of vertices as the old model.\n";
return BVH_ERR_INCORRECT_DATA;
}

Expand All @@ -625,7 +625,7 @@ int BVHModel<BV>::beginUpdateModel()
{
if(build_state != BVH_BUILD_STATE_PROCESSED && build_state != BVH_BUILD_STATE_UPDATED)
{
std::cerr << "BVH Error! Call beginUpdatemodel() on a BVHModel that has no previous frame." << std::endl;
std::cerr << "BVH Error! Call beginUpdatemodel() on a BVHModel that has no previous frame.\n";
return BVH_ERR_BUILD_EMPTY_PREVIOUS_FRAME;
}

Expand Down Expand Up @@ -654,7 +654,7 @@ int BVHModel<BV>::updateVertex(const Vector3<S>& p)
{
if(build_state != BVH_BUILD_STATE_UPDATE_BEGUN)
{
std::cerr << "BVH Warning! Call updateVertex() in a wrong order. updateVertex() was ignored. Must do a beginUpdateModel() for initialization." << std::endl;
std::cerr << "BVH Warning! Call updateVertex() in a wrong order. updateVertex() was ignored. Must do a beginUpdateModel() for initialization.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

Expand All @@ -670,7 +670,7 @@ int BVHModel<BV>::updateTriangle(const Vector3<S>& p1, const Vector3<S>& p2, con
{
if(build_state != BVH_BUILD_STATE_UPDATE_BEGUN)
{
std::cerr << "BVH Warning! Call updateTriangle() in a wrong order. updateTriangle() was ignored. Must do a beginUpdateModel() for initialization." << std::endl;
std::cerr << "BVH Warning! Call updateTriangle() in a wrong order. updateTriangle() was ignored. Must do a beginUpdateModel() for initialization.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

Expand All @@ -686,7 +686,7 @@ int BVHModel<BV>::updateSubModel(const std::vector<Vector3<S>>& ps)
{
if(build_state != BVH_BUILD_STATE_UPDATE_BEGUN)
{
std::cerr << "BVH Warning! Call updateSubModel() in a wrong order. updateSubModel() was ignored. Must do a beginUpdateModel() for initialization." << std::endl;
std::cerr << "BVH Warning! Call updateSubModel() in a wrong order. updateSubModel() was ignored. Must do a beginUpdateModel() for initialization.\n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

Expand All @@ -704,13 +704,13 @@ int BVHModel<BV>::endUpdateModel(bool refit, bool bottomup)
{
if(build_state != BVH_BUILD_STATE_UPDATE_BEGUN)
{
std::cerr << "BVH Warning! Call endUpdateModel() in a wrong order. endUpdateModel() was ignored. " << std::endl;
std::cerr << "BVH Warning! Call endUpdateModel() in a wrong order. endUpdateModel() was ignored. \n";
return BVH_ERR_BUILD_OUT_OF_SEQUENCE;
}

if(num_vertex_updated != num_vertices)
{
std::cerr << "BVH Error! The updated model should have the same number of vertices as the old model." << std::endl;
std::cerr << "BVH Error! The updated model should have the same number of vertices as the old model.\n";
return BVH_ERR_INCORRECT_DATA;
}

Expand Down Expand Up @@ -744,10 +744,10 @@ int BVHModel<BV>::memUsage(int msg) const
int total_mem = mem_bv_list + mem_tri_list + mem_vertex_list + sizeof(BVHModel<BV>);
if(msg)
{
std::cerr << "Total for model " << total_mem << " bytes." << std::endl;
std::cerr << "BVs: " << num_bvs << " allocated." << std::endl;
std::cerr << "Tris: " << num_tris << " allocated." << std::endl;
std::cerr << "Vertices: " << num_vertices << " allocated." << std::endl;
std::cerr << "Total for model " << total_mem << " bytes.\n";
std::cerr << "BVs: " << num_bvs << " allocated.\n";
std::cerr << "Tris: " << num_tris << " allocated.\n";
std::cerr << "Vertices: " << num_vertices << " allocated.\n";
}

return BVH_OK;
Expand Down Expand Up @@ -849,7 +849,7 @@ int BVHModel<BV>::buildTree()
num_primitives = num_vertices;
break;
default:
std::cerr << "BVH Error: Model type not supported!" << std::endl;
std::cerr << "BVH Error: Model type not supported!\n";
return BVH_ERR_UNSUPPORTED_FUNCTION;
}

Expand Down Expand Up @@ -903,7 +903,7 @@ int BVHModel<BV>::recursiveBuildTree(int bv_id, int first_primitive, int num_pri
}
else
{
std::cerr << "BVH Error: Model type not supported!" << std::endl;
std::cerr << "BVH Error: Model type not supported!\n";
return BVH_ERR_UNSUPPORTED_FUNCTION;
}

Expand Down Expand Up @@ -1012,7 +1012,7 @@ int BVHModel<BV>::recursiveRefitTree_bottomup(int bv_id)
}
else
{
std::cerr << "BVH Error: Model type not supported!" << std::endl;
std::cerr << "BVH Error: Model type not supported!\n";
return BVH_ERR_UNSUPPORTED_FUNCTION;
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/fcl/geometry/bvh/detail/BV_splitter-inl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void BVSplitter<BV>::computeRule(
computeRule_bvcenter(bv, primitive_indices, num_primitives);
break;
default:
std::cerr << "Split method not supported" << std::endl;
std::cerr << "Split method not supported\n";
}
}

Expand Down
2 changes: 1 addition & 1 deletion include/fcl/math/bv/OBB-inl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ S OBB<S>::distance(const OBB& other, Vector3<S>* P,
FCL_UNUSED(P);
FCL_UNUSED(Q);

std::cerr << "OBB distance not implemented!" << std::endl;
std::cerr << "OBB distance not implemented!\n";
return 0.0;
}

Expand Down
2 changes: 1 addition & 1 deletion include/fcl/math/bv/kDOP-inl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ S KDOP<S, N>::distance(const KDOP<S, N>& other, Vector3<S>* P, Vector3<S>* Q) co
FCL_UNUSED(P);
FCL_UNUSED(Q);

std::cerr << "KDOP distance not implemented!" << std::endl;
std::cerr << "KDOP distance not implemented!\n";
return 0.0;
}

Expand Down
2 changes: 1 addition & 1 deletion include/fcl/math/geometry-inl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ void eigen_old(const Matrix3<S>& m, Vector3<S>& dout, Matrix3<S>& vout)
}
}

std::cerr << "eigen: too many iterations in Jacobi transform." << std::endl;
std::cerr << "eigen: too many iterations in Jacobi transform.\n";

return;
}
Expand Down
5 changes: 2 additions & 3 deletions include/fcl/math/rng-inl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,12 @@ void RNG<S>::setSeed(uint_fast32_t seed)
if (detail::Seed::isFirstSeedGenerated())
{
std::cerr << "Random number generation already started. Changing seed now "
<< "will not lead to deterministic sampling." << std::endl;
<< "will not lead to deterministic sampling.\n";
}

if (seed == 0)
{
std::cerr << "Random generator seed cannot be 0. Using 1 instead."
<< std::endl;
std::cerr << "Random generator seed cannot be 0. Using 1 instead.\n";
detail::Seed::setUserSetSeed(1);
}
else
Expand Down
8 changes: 4 additions & 4 deletions include/fcl/narrowphase/collision-inl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ std::size_t collide(
std::size_t res;
if(request.num_max_contacts == 0)
{
std::cerr << "Warning: should stop early as num_max_contact is " << request.num_max_contacts << " !" << std::endl;
std::cerr << "Warning: should stop early as num_max_contact is " << request.num_max_contacts << " !\n";
res = 0;
}
else
Expand All @@ -124,7 +124,7 @@ std::size_t collide(
{
if(!looktable.collision_matrix[node_type2][node_type1])
{
std::cerr << "Warning: collision function between node type " << node_type1 << " and node type " << node_type2 << " is not supported"<< std::endl;
std::cerr << "Warning: collision function between node type " << node_type1 << " and node type " << node_type2 << " is not supported\n";
res = 0;
}
else
Expand All @@ -134,7 +134,7 @@ std::size_t collide(
{
if(!looktable.collision_matrix[node_type1][node_type2])
{
std::cerr << "Warning: collision function between node type " << node_type1 << " and node type " << node_type2 << " is not supported"<< std::endl;
std::cerr << "Warning: collision function between node type " << node_type1 << " and node type " << node_type2 << " is not supported\n";
res = 0;
}
else
Expand Down Expand Up @@ -201,7 +201,7 @@ std::size_t collide(
return collide(o1, tf1, o2, tf2, &solver, request, result);
}
default:
std::cerr << "Warning! Invalid GJK solver" << std::endl;
std::cerr << "Warning! Invalid GJK solver\n";
return -1; // error
}
}
Expand Down
Loading

0 comments on commit 7fcdc7f

Please sign in to comment.