Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: Modernize code, use nested namespace definition #2096

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Refactor: Modernize code, use nested namespace definition #2096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions tests/common-cleanup.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

#include <boost/filesystem.hpp>

namespace testing {
namespace cleanup {
namespace testing::cleanup {

/**
* RAII structure to remove a file upon destruction.
Expand Down Expand Up @@ -56,7 +55,6 @@ class file_t
std::string m_filename;
};

} // namespace cleanup
} // namespace testing
} // namespace testing::cleanup

#endif // OSM2PGSQL_TESTS_COMMON_CLEANUP_HPP
6 changes: 2 additions & 4 deletions tests/common-pg.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@
#include <unistd.h>
#endif

namespace testing {
/// Helper classes for postgres connections
namespace pg {
namespace testing::pg {

class conn_t : public pg_conn_t
{
Expand Down Expand Up @@ -153,7 +152,6 @@ class tempdb_t
std::string m_db_name;
};

} // namespace pg
} // namespace testing
} // namespace testing::pg

#endif // OSM2PGSQL_TESTS_COMMON_PG_HPP