Skip to content

Commit 1f2e631

Browse files
committed
Add missing std qualifiers
Change-Id: Ib7bc432c56f7a8ba062a6d74a206733872c3d089
1 parent 125c068 commit 1f2e631

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

internal/ceres/problem_impl.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ ResidualBlockId ProblemImpl::AddResidualBlock(
284284
// Check for duplicate parameter blocks.
285285
std::vector<double*> sorted_parameter_blocks(
286286
parameter_blocks, parameter_blocks + num_parameter_blocks);
287-
sort(sorted_parameter_blocks.begin(), sorted_parameter_blocks.end());
287+
std::sort(sorted_parameter_blocks.begin(), sorted_parameter_blocks.end());
288288
const bool has_duplicate_items =
289289
(std::adjacent_find(sorted_parameter_blocks.begin(),
290290
sorted_parameter_blocks.end()) !=
@@ -643,8 +643,9 @@ bool ProblemImpl::Evaluate(const Problem::EvaluateOptions& evaluate_options,
643643
program.parameter_blocks());
644644

645645
std::vector<ParameterBlock*> excluded_parameter_blocks;
646-
sort(all_parameter_blocks.begin(), all_parameter_blocks.end());
647-
sort(included_parameter_blocks.begin(), included_parameter_blocks.end());
646+
std::sort(all_parameter_blocks.begin(), all_parameter_blocks.end());
647+
std::sort(included_parameter_blocks.begin(),
648+
included_parameter_blocks.end());
648649
set_difference(all_parameter_blocks.begin(),
649650
all_parameter_blocks.end(),
650651
included_parameter_blocks.begin(),

internal/ceres/reorder_program.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,9 @@ bool LexicographicallyOrderResidualBlocks(
286286
<< "Congratulations, you found a Ceres bug! Please report this error "
287287
<< "to the developers.";
288288

289-
CHECK(find(residual_blocks_per_e_block.begin(),
290-
residual_blocks_per_e_block.end() - 1,
291-
0) == residual_blocks_per_e_block.end() - 1)
289+
CHECK(std::find(residual_blocks_per_e_block.begin(),
290+
residual_blocks_per_e_block.end() - 1,
291+
0) == residual_blocks_per_e_block.end() - 1)
292292
<< "Congratulations, you found a Ceres bug! Please report this error "
293293
<< "to the developers.";
294294

internal/ceres/schur_complement_solver.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,9 @@ void SparseSchurComplementSolver::InitStorage(
257257
}
258258
}
259259

260-
sort(f_blocks.begin(), f_blocks.end());
261-
f_blocks.erase(unique(f_blocks.begin(), f_blocks.end()), f_blocks.end());
260+
std::sort(f_blocks.begin(), f_blocks.end());
261+
f_blocks.erase(std::unique(f_blocks.begin(), f_blocks.end()),
262+
f_blocks.end());
262263
for (int i = 0; i < f_blocks.size(); ++i) {
263264
for (int j = i + 1; j < f_blocks.size(); ++j) {
264265
block_pairs.emplace(f_blocks[i], f_blocks[j]);

internal/ceres/stl_util.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ void STLDeleteContainerPointers(ForwardIterator begin, ForwardIterator end) {
5959
template <class ForwardIterator>
6060
void STLDeleteUniqueContainerPointers(ForwardIterator begin,
6161
ForwardIterator end) {
62-
sort(begin, end);
63-
ForwardIterator new_end = unique(begin, end);
62+
std::sort(begin, end);
63+
ForwardIterator new_end = std::unique(begin, end);
6464
while (begin != new_end) {
6565
ForwardIterator temp = begin;
6666
++begin;

internal/ceres/trust_region_minimizer.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,9 @@ bool TrustRegionMinimizer::ComputeTrustRegionStep() {
380380
iteration_summary_.step_is_valid = false;
381381
TrustRegionStrategy::PerSolveOptions per_solve_options;
382382
per_solve_options.eta = options_.eta;
383-
if (find(options_.trust_region_minimizer_iterations_to_dump.begin(),
384-
options_.trust_region_minimizer_iterations_to_dump.end(),
385-
iteration_summary_.iteration) !=
383+
if (std::find(options_.trust_region_minimizer_iterations_to_dump.begin(),
384+
options_.trust_region_minimizer_iterations_to_dump.end(),
385+
iteration_summary_.iteration) !=
386386
options_.trust_region_minimizer_iterations_to_dump.end()) {
387387
per_solve_options.dump_format_type =
388388
options_.trust_region_problem_dump_format_type;

0 commit comments

Comments
 (0)