Skip to content

Commit 8549448

Browse files
committed
Removed conditional stattemt for app_name_libhpx_wrap HPX_APPLICATOIN_STRING
Signed-off-by: Bharath <bharath.kollanur@gmail.com>
1 parent 366bb38 commit 8549448

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

tests/unit/init/auto_wrap_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ int main(int, char**)
1919
HPX_TEST(f.get());
2020

2121
return hpx::util::report_errors();
22-
}
22+
}

wrap/src/hpx_wrap.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,23 @@ namespace hpx_start {
1818
// include_libhpx_wrap is a weak symbol which helps to determine the course
1919
// of function calls at runtime. It has a default value of `false` which
2020
// corresponds to the program's entry point being main().
21-
// It is overridden in hpx/hpx_main.hpp or set as TRUE if HPX_AUTO_WRAP_MAIN_ACTIVATE is defined.
21+
// It is overridden in hpx/hpx_main.hpp or set as TRUE if
22+
// HPX_AUTO_WRAP_MAIN_ACTIVATE is defined.
2223
// Thus, inclusion of the header file or defining HPX_AUTO_WRAP_MAIN_ACTIVATE
2324
// will change the program's entry point to HPX's own custom entry point
2425
// initialize_main. Subsequent calls before entering main() are handled
2526
// by this code.
2627
HPX_SYMBOL_EXPORT extern bool include_libhpx_wrap;
27-
HPX_SYMBOL_EXPORT bool include_libhpx_wrap __attribute__((weak)) =
2828
#if defined(HPX_AUTO_WRAP_MAIN_ACTIVATE)
29-
true;
29+
HPX_SYMBOL_EXPORT bool include_libhpx_wrap __attribute__((weak)) = true;
3030
#else
31-
false;
31+
HPX_SYMBOL_EXPORT bool include_libhpx_wrap __attribute__((weak)) = false;
3232
#endif
3333
// The default application name is populated by including hpx/hpx_main.hpp
3434
// or if HPX_AUTO_WRAP_MAIN_ACTIVATE is defined.
3535
HPX_SYMBOL_EXPORT extern const char* app_name_libhpx_wrap;
3636
HPX_SYMBOL_EXPORT const char* app_name_libhpx_wrap __attribute__((weak)) =
37-
#if defined(HPX_AUTO_WRAP_MAIN_ACTIVATE)
3837
HPX_APPLICATION_STRING;
39-
#else
40-
nullptr;
41-
#endif
4238

4339
// Provide a definition of is_linked variable defined weak in hpx_main.hpp
4440
// header. This variable is solely to trigger a different exception when

0 commit comments

Comments
 (0)