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.

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

fixing multiple translation unit proble. Closes #309. #319

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion libmpdata++/formulae/arakawa_c.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ namespace libmpdataxx
{
namespace arakawa_c
{
struct hlf_t {} h;
namespace {
struct hlf_t {} h;
}

inline rng_t operator+(
const rng_t &i, const hlf_t &
Expand Down
4 changes: 2 additions & 2 deletions libmpdata++/output/detail/xdmf_writer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace libmpdataxx
{
namespace output
{
namespace detail
namespace detail { namespace
{
template<int dim>
class xdmf_writer
Expand Down Expand Up @@ -201,6 +201,6 @@ namespace libmpdataxx
const std::string xdmf_writer<dim>::name = "Grid";
template<int dim>
const std::string xdmf_writer<dim>::grid_type = "Uniform";
}
}}
}
}
4 changes: 2 additions & 2 deletions libmpdata++/solvers/detail/monitor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace libmpdataxx
{
namespace solvers
{
namespace detail
namespace detail { namespace
{
void monitor(float frac)
{
Expand All @@ -38,7 +38,7 @@ namespace libmpdataxx
#elif defined(HAVE_PTHREAD_SETNAME_NP) && defined(HAVE_PTHREAD_GETNAME_NP)
pthread_setname_np(name);
#endif
}
}}
};
};
};
1 change: 1 addition & 0 deletions tests/unit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ add_subdirectory(concurrent_1d)
add_subdirectory(hint_scale)
add_subdirectory(hdf5_catch)
add_subdirectory(git_revision)
add_subdirectory(mltpl_transl_unit)
4 changes: 4 additions & 0 deletions tests/unit/mltpl_transl_unit/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# this is a compile-only test, nothing us run during "make test"
add_executable(mltpl_transl_unit test_mltpl_transl_unit.cpp u1.cpp u2.cpp)
target_link_libraries(mltpl_transl_unit ${libmpdataxx_LIBRARIES})
target_include_directories(mltpl_transl_unit PUBLIC ${libmpdataxx_INCLUDE_DIRS})
1 change: 1 addition & 0 deletions tests/unit/mltpl_transl_unit/test_mltpl_transl_unit.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
int main() {}
17 changes: 17 additions & 0 deletions tests/unit/mltpl_transl_unit/test_mltpl_transl_unit.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#pragma once

#include <libmpdata++/solvers/mpdata.hpp>
#include <libmpdata++/output/hdf5_xdmf.hpp>

struct ct_params_t : libmpdataxx::ct_params_default_t
{
enum { n_dims = 3 };
enum { n_eqns = 3 };
using real_t = double;
};

using slv_out_t = libmpdataxx::output::hdf5_xdmf<
libmpdataxx::solvers::mpdata<
ct_params_t
>
>;
3 changes: 3 additions & 0 deletions tests/unit/mltpl_transl_unit/u1.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "test_mltpl_transl_unit.hpp"

slv_out_t s1(slv_out_t::rt_params_t());
3 changes: 3 additions & 0 deletions tests/unit/mltpl_transl_unit/u2.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "test_mltpl_transl_unit.hpp"

slv_out_t s2(slv_out_t::rt_params_t());