Silent no previous declaration warning for FindParameterBlockOrDie Use anonymous namespace for this. Also move some surrounding static function to this anonymous namespace. Change-Id: Ie235eb7936976563a9db115ec13c59e6e6869b96
diff --git a/internal/ceres/problem_impl.cc b/internal/ceres/problem_impl.cc index 2972443..69d672e 100644 --- a/internal/ceres/problem_impl.cc +++ b/internal/ceres/problem_impl.cc
@@ -57,6 +57,7 @@ typedef map<double*, internal::ParameterBlock*> ParameterMap; +namespace { internal::ParameterBlock* FindParameterBlockOrDie( const ParameterMap& parameter_map, double* parameter_block) { @@ -68,16 +69,16 @@ // Returns true if two regions of memory, a and b, with sizes size_a and size_b // respectively, overlap. -static bool RegionsAlias(const double* a, int size_a, - const double* b, int size_b) { +bool RegionsAlias(const double* a, int size_a, + const double* b, int size_b) { return (a < b) ? b < (a + size_a) : a < (b + size_b); } -static void CheckForNoAliasing(double* existing_block, - int existing_block_size, - double* new_block, - int new_block_size) { +void CheckForNoAliasing(double* existing_block, + int existing_block_size, + double* new_block, + int new_block_size) { CHECK(!RegionsAlias(existing_block, existing_block_size, new_block, new_block_size)) << "Aliasing detected between existing parameter block at memory " @@ -87,6 +88,8 @@ << "size " << new_block_size << "."; } +} // namespace + ParameterBlock* ProblemImpl::InternalAddParameterBlock(double* values, int size) { CHECK(values != NULL) << "Null pointer passed to AddParameterBlock "