Skip to content

Commit 30afe75

Browse files
committed
remove mgis::string_view for std::string_view
1 parent dbb7d91 commit 30afe75

25 files changed

Lines changed: 121 additions & 1356 deletions

bindings/c/src/Hypothesis.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ mgis_status mgis_bv_get_tensor_size(mgis_size_type* const s,
7070
return mgis_report_success();
7171
} // end of mgis_bv_get_tensor_size
7272

73-
} // end of extern "C"
73+
} // end of extern "C"

bindings/c/src/Variable.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ mgis_status mgis_bv_get_variable_size(mgis_size_type* const s,
2828
"unsupported variable type");
2929
} // end of mgis_bv_get_variable_size
3030

31-
} // end of extern "C"
31+
} // end of extern "C"

bindings/python/src/BehaviourDescription.cxx

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,16 @@ static const char *BehaviourDescription_getType(
2929
switch (b.btype) {
3030
case BehaviourDescription::GENERALBEHAVIOUR:
3131
return "GeneralBehaviour";
32-
break;
3332
case BehaviourDescription::STANDARDSTRAINBASEDBEHAVIOUR:
3433
return "StandardStrainBasedBehaviour";
35-
break;
3634
case BehaviourDescription::STANDARDFINITESTRAINBEHAVIOUR:
3735
return "StandardFiniteStrainBehaviour";
38-
break;
3936
case BehaviourDescription::COHESIVEZONEMODEL:
4037
return "CohesiveZoneModel";
41-
break;
4238
default:
43-
mgis::raise("BehaviourDescription_getType: unsupported behaviour type");
39+
break;
4440
}
45-
return "";
41+
mgis::raise("BehaviourDescription_getType: unsupported behaviour type");
4642
} // end of BehaviourDescription_getType
4743

4844
static const char *BehaviourDescription_getKinematic(
@@ -51,16 +47,12 @@ static const char *BehaviourDescription_getKinematic(
5147
switch (b.kinematic) {
5248
case BehaviourDescription::SMALLSTRAINKINEMATIC:
5349
return "SmallStrainKinematic";
54-
break;
5550
case BehaviourDescription::COHESIVEZONEKINEMATIC:
5651
return "CohesiveZoneKinematic";
57-
break;
5852
case BehaviourDescription::FINITESTRAINKINEMATIC_F_CAUCHY:
5953
return "F_CAUCHY";
60-
break;
6154
case BehaviourDescription::FINITESTRAINKINEMATIC_ETO_PK1:
6255
return "ETO_PK1";
63-
break;
6456
case BehaviourDescription::UNDEFINEDKINEMATIC:
6557
default:
6658
break;
@@ -77,10 +69,9 @@ static const char *BehaviourDescription_getSymmetry(
7769
case BehaviourDescription::ORTHOTROPIC:
7870
return "Orthotropic";
7971
default:
80-
mgis::raise("unsupported symmetry type");
8172
break;
8273
}
83-
return "UndefinedSymemtry";
74+
mgis::raise("unsupported symmetry type");
8475
} // end of BehaviourDescription_getSymmetry
8576

8677
static std::vector<mgis::behaviour::Variable> BehaviourDescription_getGradients(

bindings/python/src/FiniteStrainSupport.cxx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121
// forward declaration
2222
void declareFiniteStrainSupport();
2323

24-
void py_convertFiniteStrainStress(boost::python::object o,
25-
const mgis::behaviour::MaterialDataManager& m,
26-
const mgis::behaviour::FiniteStrainStress t) {
24+
static void py_convertFiniteStrainStress(
25+
boost::python::object o,
26+
const mgis::behaviour::MaterialDataManager& m,
27+
const mgis::behaviour::FiniteStrainStress t) {
2728
auto s = mgis::python::mgis_convert_to_span(o);
2829
mgis::behaviour::convertFiniteStrainStress(s, m, t);
2930
} // end of py_py_convertFiniteStrainStress
3031

31-
void py_convertFiniteStrainTangentOperator(
32+
static void py_convertFiniteStrainTangentOperator(
3233
boost::python::object o,
3334
const mgis::behaviour::MaterialDataManager& m,
3435
const mgis::behaviour::FiniteStrainTangentOperator t) {

bindings/python/src/Integrate.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ MaterialDataManager_executePostProcessing2(
130130
return mgis::behaviour::executePostProcessing(output, m, n, b, e);
131131
}
132132

133-
mgis::behaviour::MultiThreadedBehaviourIntegrationResult
133+
static mgis::behaviour::MultiThreadedBehaviourIntegrationResult
134134
MaterialDataManager_executePostProcessing3(
135135
boost::python::object o,
136136
mgis::ThreadPool& t,

bindings/python/src/ThreadPool.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
void declareThreadPool() {
1919
boost::python::class_<mgis::ThreadPool, boost::noncopyable>(
2020
"ThreadPool", boost::python::init<mgis::size_type>());
21-
} // end of declareThreadPool
21+
} // end of declareThreadPool

cmake/modules/clang.cmake

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ else(enable-fast-math)
2424
tfel_enable_cxx_compiler_flag(OPTIMISATION_FLAGS2 "ffast-math")
2525
endif(enable-fast-math)
2626

27-
tfel_enable_cxx_compiler_flag(VISIBILITY_FLAGS "fvisibility=hidden")
28-
tfel_enable_cxx_compiler_flag(VISIBILITY_FLAGS "fvisibility-inlines-hidden")
29-
set(COMPILER_DEFAULT_VISIBILITY_FLAG "-fvisibility=default")
27+
if(NOT WIN32)
28+
tfel_enable_cxx_compiler_flag(VISIBILITY_FLAGS "fvisibility=hidden")
29+
tfel_enable_cxx_compiler_flag(VISIBILITY_FLAGS "fvisibility-inlines-hidden")
30+
set(COMPILER_DEFAULT_VISIBILITY_FLAG "-fvisibility=default")
31+
endif(NOT WIN32)
3032

3133
set(OPTIMISATION_FLAGS "-DNO_RUNTIME_CHECK_BOUNDS ${OPTIMISATION_FLAGS}")
3234

@@ -40,7 +42,11 @@ endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
4042

4143
if(HAVE_FORTRAN)
4244
# we associate clang with the gnu fortran compiler
43-
include(cmake/modules/gnu-fortran-compiler.cmake)
45+
if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "IntelLLVM")
46+
set(INTEL_FORTRAN_COMPILER ON)
47+
else()
48+
include(cmake/modules/gnu-fortran-compiler.cmake)
49+
endif()
4450
endif(HAVE_FORTRAN)
4551

4652
option(enable-libcxx "use LLVM C++ Standard library" OFF)

docs/web/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ if(MGIS_HAVE_PANDOC)
6464
mgis_pandoc_generate_html_page(install)
6565
mgis_pandoc_generate_html_page(contributing)
6666
mgis_pandoc_generate_html_page(bindings-cxx "--toc" "--toc-depth=3")
67+
mgis_pandoc_generate_html_page(release-notes-1.0.2 "--toc" "--toc-depth=3")
6768
mgis_pandoc_generate_html_page(release-notes-1.1 "--toc" "--toc-depth=3")
6869
mgis_pandoc_generate_html_page(release-notes-1.1.1 "--toc" "--toc-depth=3")
6970
mgis_pandoc_generate_html_page(release-notes-1.2 "--toc" "--toc-depth=3")

docs/web/mgis-template.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@
7373
</li>
7474
<li><a>Release notes</a>
7575
<ul>
76+
<li><a>Version 1.0.x</a>
77+
<ul>
78+
<li><a href="release-notes-1.0.2.html">Version 1.0.2</a></li>
79+
</ul>
80+
</li>
7681
<li><a>Version 1.1.x</a>
7782
<ul>
7883
<li><a href="release-notes-1.1.html">Version 1.1</a></li>

include/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ mgis_header(MGIS Cste.hxx)
44
mgis_header(MGIS Raise.ixx)
55
mgis_header(MGIS Raise.hxx)
66
mgis_header(MGIS StorageMode.hxx)
7-
mgis_header(MGIS StringView.hxx)
8-
mgis_header(MGIS StringView.ixx)
97
mgis_header(MGIS ThreadPool.hxx)
108
mgis_header(MGIS ThreadPool.ixx)
119
mgis_header(MGIS ThreadedTaskResult.hxx)

0 commit comments

Comments
 (0)