[Bf-blender-cvs] [2633683b520] master: Clang-tidy: enable readability-container-size-empty warning
Jacques Lucke
noreply at git.blender.org
Fri Jul 3 15:01:17 CEST 2020
Commit: 2633683b52054d15006aea1314f62f73a8505b42
Author: Jacques Lucke
Date: Fri Jul 3 14:59:27 2020 +0200
Branches: master
https://developer.blender.org/rB2633683b52054d15006aea1314f62f73a8505b42
Clang-tidy: enable readability-container-size-empty warning
Reviewers: sergey
Differential Revision: https://developer.blender.org/D8197
===================================================================
M .clang-tidy
M source/blender/blenkernel/intern/volume.cc
M source/blender/compositor/intern/COM_WorkScheduler.cpp
M source/blender/freestyle/intern/application/Controller.cpp
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
M source/blender/freestyle/intern/geometry/Grid.cpp
M source/blender/freestyle/intern/scene_graph/NodeShape.cpp
M source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
M source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
M source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/io/alembic/exporter/abc_writer_hair.cc
M source/blender/io/alembic/exporter/abc_writer_mesh.cc
M source/blender/io/alembic/intern/alembic_capi.cc
M source/blender/io/collada/AnimationExporter.cpp
M source/blender/io/collada/AnimationImporter.cpp
M source/blender/io/collada/ArmatureImporter.cpp
M source/blender/io/collada/BCAnimationSampler.cpp
M source/blender/io/collada/DocumentImporter.cpp
M source/blender/io/collada/MeshImporter.cpp
M source/blender/io/collada/SkinInfo.cpp
M source/blender/io/collada/collada_internal.cpp
M source/blender/io/common/intern/abstract_hierarchy_iterator.cc
===================================================================
diff --git a/.clang-tidy b/.clang-tidy
index f901ba837cb..7d8d4e9c3c0 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -25,7 +25,6 @@ Checks: >
-readability-redundant-string-init,
-readability-redundant-member-init,
-readability-const-return-type,
- -readability-container-size-empty,
-readability-redundant-string-cstr,
-readability-static-accessed-through-instance,
-readability-redundant-declaration,
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index 26c5810aefa..39c04d117e2 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -152,7 +152,7 @@ static struct VolumeFileCache {
~VolumeFileCache()
{
- assert(cache.size() == 0);
+ assert(cache.empty());
}
Entry *add_metadata_user(const Entry &template_entry)
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index 92e64c33d4d..f4da16efd22 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -184,7 +184,7 @@ bool WorkScheduler::hasGPUDevices()
{
#if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
# ifdef COM_OPENCL_ENABLED
- return g_gpudevices.size() > 0;
+ return !g_gpudevices.empty();
# else
return 0;
# endif
@@ -210,7 +210,7 @@ void WorkScheduler::initialize(bool use_opencl, int num_cpu_threads)
if (g_cpudevices.size() != num_cpu_threads) {
Device *device;
- while (g_cpudevices.size() > 0) {
+ while (!g_cpudevices.empty()) {
device = g_cpudevices.back();
g_cpudevices.pop_back();
device->deinitialize();
@@ -331,7 +331,7 @@ void WorkScheduler::deinitialize()
/* deinitialize CPU threads */
if (g_cpuInitialized) {
Device *device;
- while (g_cpudevices.size() > 0) {
+ while (!g_cpudevices.empty()) {
device = g_cpudevices.back();
g_cpudevices.pop_back();
device->deinitialize();
@@ -345,7 +345,7 @@ void WorkScheduler::deinitialize()
/* deinitialize OpenCL GPU's */
if (g_openclInitialized) {
Device *device;
- while (g_gpudevices.size() > 0) {
+ while (!g_gpudevices.empty()) {
device = g_gpudevices.back();
g_gpudevices.pop_back();
device->deinitialize();
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index 253d62ea3dc..dfe78eaf10c 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -469,7 +469,7 @@ void Controller::DeleteViewMap(bool freeCache)
void Controller::ComputeViewMap()
{
- if (!_ListOfModels.size()) {
+ if (_ListOfModels.empty()) {
return;
}
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index 996906826e9..0af57e5d728 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -746,7 +746,7 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id)
detriList.push_back(detri);
}
- if (detriList.size() > 0) {
+ if (!detriList.empty()) {
vector<detri_t>::iterator v;
for (v = detriList.begin(); v != detriList.end(); v++) {
detri_t detri = (*v);
diff --git a/source/blender/freestyle/intern/geometry/Grid.cpp b/source/blender/freestyle/intern/geometry/Grid.cpp
index e3e25796de1..46e91197764 100644
--- a/source/blender/freestyle/intern/geometry/Grid.cpp
+++ b/source/blender/freestyle/intern/geometry/Grid.cpp
@@ -93,7 +93,7 @@ bool firstIntersectionGridVisitor::stop()
/////////////////
void Grid::clear()
{
- if (_occluders.size() != 0) {
+ if (!_occluders.empty()) {
for (OccludersSet::iterator it = _occluders.begin(); it != _occluders.end(); it++) {
delete (*it);
}
@@ -154,7 +154,7 @@ void Grid::configure(const Vec3r &orig, const Vec3r &size, unsigned nb)
void Grid::insertOccluder(Polygon3r *occluder)
{
const vector<Vec3r> vertices = occluder->getVertices();
- if (vertices.size() == 0) {
+ if (vertices.empty()) {
return;
}
diff --git a/source/blender/freestyle/intern/scene_graph/NodeShape.cpp b/source/blender/freestyle/intern/scene_graph/NodeShape.cpp
index e55b2fb625f..cf7a609b347 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeShape.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeShape.cpp
@@ -27,7 +27,7 @@ NodeShape::~NodeShape()
{
vector<Rep *>::iterator rep;
- if (0 != _Shapes.size()) {
+ if (!_Shapes.empty()) {
for (rep = _Shapes.begin(); rep != _Shapes.end(); ++rep) {
int refCount = (*rep)->destroy();
if (0 == refCount) {
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index c3c43ce6722..b7de3a5b319 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -633,7 +633,7 @@ static void computeCumulativeVisibility(ViewMap *ioViewMap,
wFaces.clear();
}
- if (iRenderMonitor && vedges.size()) {
+ if (iRenderMonitor && !vedges.empty()) {
stringstream ss;
ss << "Freestyle: Visibility computations " << (100 * cnt / vedges.size()) << "%";
iRenderMonitor->setInfo(ss.str());
diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
index 8357231a73d..ef79384e2af 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
@@ -25,7 +25,7 @@ namespace Freestyle {
NodeGroup *ViewMapTesselator::Tesselate(ViewMap *iViewMap)
{
- if (0 == iViewMap->ViewEdges().size()) {
+ if (iViewMap->ViewEdges().empty()) {
return NULL;
}
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index 620601df5e7..63f65988fc9 100644
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
@@ -200,7 +200,7 @@ bool WingedEdgeBuilder::buildWShape(WShape &shape, IndexedFaceSet &ifs)
delete[] new_vertices;
delete[] new_normals;
- if (shape.GetFaceList().size() == 0) { // this may happen due to degenerate triangles
+ if (shape.GetFaceList().empty()) { // this may happen due to degenerate triangles
return false;
}
@@ -219,8 +219,8 @@ bool WingedEdgeBuilder::buildWShape(WShape &shape, IndexedFaceSet &ifs)
if ((*wv)->isBoundary()) {
continue;
}
- if ((*wv)->GetEdges().size() ==
- 0) { // This means that the WVertex has no incoming edges... (12-Sep-2011 T.K.)
+ if ((*wv)->GetEdges().empty()) {
+ // This means that the WVertex has no incoming edges... (12-Sep-2011 T.K.)
continue;
}
normalsSet.clear();
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 0555d213b3f..2a5532a0902 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -816,7 +816,7 @@ void IMB_exr_add_channel(void *handle,
if (layname && layname[0] != '\0') {
imb_exr_insert_view_name(echan->name, echan->m->name.c_str(), echan->m->view.c_str());
}
- else if (data->multiView->size() >= 1) {
+ else if (!data->multiView->empty()) {
std::string raw_name = insertViewName(echan->m->name, *data->multiView, echan->view_id);
BLI_strncpy(echan->name, raw_name.c_str(), sizeof(echan->name));
}
@@ -1066,7 +1066,7 @@ float *IMB_exr_channel_rect(void *handle,
imb_exr_insert_view_name(temp_buf, name, viewname);
BLI_strncpy(name, temp_buf, sizeof(name));
}
- else if (data->multiView->size() >= 1) {
+ else if (!data->multiView->empty()) {
const int view_id = std::max(0, imb_exr_get_multiView_id(*data->multiView, viewname));
std::string raw_name = insertViewName(name, *data->multiView, view_id);
BLI_strncpy(name, raw_name.c_str(), sizeof(name));
@@ -1300,7 +1300,7 @@ void IMB_exr_multilayer_convert(void *handle,
ExrPass *pass;
/* RenderResult needs at least one RenderView */
- if (data->multiView->size() == 0) {
+ if (data->multiView->empty()) {
addview(base, "");
}
else {
@@ -1775,7 +1775,7 @@ static bool imb_exr_is_multilayer_file(MultiPartInputFile &file)
* channels without a layer name will be single layer. */
channels.layers(layerNames);
- return (layerNames.size() > 0);
+ return (!layerNames.empty());
}
static void imb_exr_type_by_channels(ChannelList &channels,
@@ -1792,7 +1792,7 @@ static void imb_exr_type_by_channels(ChannelList &channels,
/* will not include empty layer names */
channels.layers(layerNames);
- if (views.size() && views[0] != "") {
+ if (!views.empty() && !views[0].empty()) {
*r_multiview = true;
}
else {
@@ -1802,7 +1802,7 @@ static void imb_exr_type_by_channels(ChannelList &channels,
return;
}
- if (layerNames.size()) {
+ if (!layerNames.empty()) {
/* if layerNames is not empty, it means at least one layer is non-empty,
* but it also could be layers without names in the file and such case
* shall be considered a multilayer exr
diff --git a/source/blender/io/alembic/exporter/abc_writer_hair.cc b/source/blender/io/alembic/exporter/abc_writer_hair.cc
index ac4deddd9b4..f9b4619b263 100644
--- a/source/blender/io/alembic/exporter/abc_writer_hair.cc
+++ b/source/blender/io/alembic/exporter/abc_writer_hair.cc
@@ -282,10 +282,10 @@ void ABCHairWriter::write_hair_child_sample(const HierarchyContext &context,
norm_values.push_back(Imath::V3f(tmpnor[0], tmpnor[2], -tmpnor[1]));
}
else {
- if (uv_values.size()) {
+ if (!uv_values.empty()) {
uv_values.push_back(uv_values[pc->parent]);
}
- if
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list