Skip to content

Commit c6cb9c8

Browse files
Merge remote-tracking branch 'origin/dev_portability'
2 parents b3a155f + ba934c2 commit c6cb9c8

File tree

7 files changed

+14
-7
lines changed

7 files changed

+14
-7
lines changed

CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ if(NOT DEFINED PROJECT_ROOT)
99
endif()
1010

1111
# Bootstrap project_utils
12-
set(sub_repo_path "${PROJECT_ROOT}/external/project_utils")
13-
file(GLOB sub_repo_files ${sub_repo_path}/*)
14-
list(LENGTH sub_repo_files sub_repo_nb_files)
15-
if(sub_repo_nb_files EQUAL 0)
12+
file(GLOB project_utils_files "${PROJECT_ROOT}/external/project_utils/*")
13+
list(LENGTH project_utils_files n_file_project_utils)
14+
if(n_file_project_utils EQUAL 0)
1615
message(FATAL_ERROR
17-
"${sub_repo_path} is empty.
16+
"external/project_utils is empty.
1817
Maybe you forgot to initialize it with \"git submodule update --init\""
1918
)
2019
endif()

std_e/base/stacktrace_to_string.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <cxxabi.h>
66
#include <iostream>
77

8-
#if __CYGWIN__
8+
#if defined(__CYGWIN__) || !defined(__GLIBC__)
99
namespace std_e {
1010
auto stacktrace_to_string() -> std::string { return "no backtrace on CYGWIN"; }
1111
}

std_e/base/system/mem_usage.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ remaining_system_memory_in_bytes() -> long {
2222

2323
auto
2424
malloc_mem_info() -> void {
25-
malloc_stats(); // NOTE: see also mallinfo()
25+
#if defined(__GLIBC__)
26+
malloc_stats(); // NOTE: see also mallinfo()
27+
#else
28+
throw std_e::msg_exception("malloc_stats not implemented on non-glibc system");
29+
#endif
2630
}
2731

2832

std_e/interval/test/accumulate.test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33

44
#include "std_e/interval/accumulate.hpp"
5+
#include <cstdint>
56

67

78
TEST_CASE("apply_accumulate") {

std_e/multi_array/test/utils.test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "std_e/unit_test/doctest.hpp"
22
#include "std_e/multi_array/utils.hpp"
33
#include "std_e/multi_array/multi_array.hpp"
4+
#include <cstdint>
45

56

67
using namespace std_e;

std_e/parallel/mpi/base.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <mpi.h>
55
#include "std_e/parallel/mpi/mpi_exception.hpp"
6+
#include <cstdint>
67

78

89
namespace std_e {

std_e/utils/pretty_print.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include <string>
4+
#include <cstdint>
45

56
namespace std_e {
67

0 commit comments

Comments
 (0)