Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Fix missing colmap namespace in file macro.#4159

Merged
B1ueber2y merged 1 commit into
maincolmap/colmap:mainfrom
shaohui/fix_file_macrocolmap/colmap:shaohui/fix_file_macroCopy head branch name to clipboard
Feb 28, 2026
Merged

Fix missing colmap namespace in file macro.#4159
B1ueber2y merged 1 commit into
maincolmap/colmap:mainfrom
shaohui/fix_file_macrocolmap/colmap:shaohui/fix_file_macroCopy head branch name to clipboard

Conversation

@B1ueber2y

Copy link
Copy Markdown
Contributor

Already addressed in #3770, but somehow regressed in #4058

@B1ueber2y
B1ueber2y enabled auto-merge (squash) February 28, 2026 13:48
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request resolves a regression by reintroducing explicit namespace qualifications for several file utility functions within their respective THROW_CHECK macros. This ensures that functions like ExistsFile, ExistsDir, and HasFileExtension are correctly resolved to the colmap namespace, preventing compilation errors and maintaining code integrity.

Highlights

  • Namespace Qualification: Explicitly qualified ExistsFile, ExistsDir, and HasFileExtension functions with the colmap:: namespace within their respective THROW_CHECK macros.
  • Regression Fix: Addressed a regression where the colmap namespace qualification was missing from utility functions used in macros, which had previously been fixed but reappeared.
Changelog
  • src/colmap/util/file.h
    • Added colmap:: namespace prefix to ExistsFile within the THROW_CHECK_FILE_EXISTS macro.
    • Added colmap:: namespace prefix to ExistsDir within the THROW_CHECK_DIR_EXISTS macro.
    • Added colmap:: namespace prefix to HasFileExtension within the THROW_CHECK_HAS_FILE_EXTENSION macro.
Activity
  • No human activity has been recorded on this pull request yet.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request correctly adds the colmap:: namespace qualifier to function calls within macros in file.h, fixing a regression that could cause compilation errors. My review also identified a potential issue in the modified macros where arguments can be evaluated multiple times, which could lead to subtle bugs. The comments detailing these issues have been retained as they do not conflict with any provided rules.

Comment thread src/colmap/util/file.h
Comment on lines +42 to +44
#define THROW_CHECK_FILE_EXISTS(path) \
THROW_CHECK(colmap::ExistsFile(path)) \
<< "File " << (path) << " does not exist."

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The macro argument path is evaluated twice: once in colmap::ExistsFile(path) and again in the stream output << (path). This can lead to incorrect behavior or performance degradation if an expression with side effects or an expensive function call is passed as path. This is a common pitfall with function-like macros, and a safer implementation would evaluate the argument only once.

Comment thread src/colmap/util/file.h
Comment on lines +46 to +48
#define THROW_CHECK_DIR_EXISTS(path) \
THROW_CHECK(colmap::ExistsDir(path)) \
<< "Directory " << (path) << " does not exist."

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The macro argument path is evaluated twice: once in colmap::ExistsDir(path) and again in the stream output << (path). This can lead to incorrect behavior or performance degradation if an expression with side effects or an expensive function call is passed as path. This is a common pitfall with function-like macros, and a safer implementation would evaluate the argument only once.

Comment thread src/colmap/util/file.h
Comment on lines 60 to 63
#define THROW_CHECK_HAS_FILE_EXTENSION(path, ext) \
THROW_CHECK(HasFileExtension(path, ext)) \
THROW_CHECK(colmap::HasFileExtension(path, ext)) \
<< "Path " << (path) << " does not match file extension " << (ext) \
<< "."

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The macro arguments path and ext are evaluated twice. For example, path is used in colmap::HasFileExtension(path, ext) and again in << (path). This can lead to incorrect behavior or performance degradation if expressions with side effects or expensive function calls are passed as arguments. This is a common pitfall with function-like macros, and a safer implementation would evaluate arguments only once.

@ahojnnes

Copy link
Copy Markdown
Contributor

The Gemini comments are valid. I guess we could do const auto& path_val = path; and then use path_val?

@B1ueber2y
B1ueber2y merged commit fbd5794 into main Feb 28, 2026
14 of 15 checks passed
@B1ueber2y
B1ueber2y deleted the shaohui/fix_file_macro branch February 28, 2026 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.