Skip to content

Commit a36acd9

Browse files
thelferthelfer
committed
pass std::string_view by copy
1 parent 4789347 commit a36acd9

2 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎include/MGIS/Behaviour/MaterialStateManager.hxx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ namespace mgis::behaviour {
226226
*/
227227
MGIS_EXPORT void setMaterialProperty(
228228
MaterialStateManager&,
229-
const std::string_view&,
229+
std::string_view,
230230
const real,
231231
const MaterialStateManager::UpdatePolicy = MaterialStateManager::UPDATE);
232232
/*!
@@ -239,7 +239,7 @@ namespace mgis::behaviour {
239239
*/
240240
MGIS_EXPORT void setMaterialProperty(
241241
MaterialStateManager&,
242-
const std::string_view&,
242+
std::string_view,
243243
const std::span<mgis::real>&,
244244
const MaterialStateManager::StorageMode =
245245
MaterialStateManager::LOCAL_STORAGE,
@@ -256,7 +256,7 @@ namespace mgis::behaviour {
256256
MGIS_EXPORT [[nodiscard]] bool setMaterialProperty(
257257
Context&,
258258
MaterialStateManager&,
259-
const std::string_view&,
259+
std::string_view,
260260
const real,
261261
const MaterialStateManager::UpdatePolicy =
262262
MaterialStateManager::UPDATE) noexcept;
@@ -273,7 +273,7 @@ namespace mgis::behaviour {
273273
MGIS_EXPORT [[nodiscard]] bool setMaterialProperty(
274274
Context&,
275275
MaterialStateManager&,
276-
const std::string_view&,
276+
std::string_view,
277277
const std::span<mgis::real>&,
278278
const MaterialStateManager::StorageMode =
279279
MaterialStateManager::LOCAL_STORAGE,
@@ -288,21 +288,21 @@ namespace mgis::behaviour {
288288
* \param[in] n: name
289289
*/
290290
MGIS_EXPORT [[nodiscard]] bool unsetMaterialProperty(
291-
Context&, MaterialStateManager&, const std::string_view&) noexcept;
291+
Context&, MaterialStateManager&, std::string_view) noexcept;
292292
/*!
293293
* \return true if the given external state variable is defined.
294294
* \param[out] m: material state manager
295295
* \param[in] n: name
296296
*/
297297
MGIS_EXPORT bool isMaterialPropertyDefined(const MaterialStateManager&,
298-
const std::string_view&);
298+
std::string_view);
299299
/*!
300300
* \brief chek if the given material property is uniform
301301
* \param[out] m: material state manager
302302
* \param[in] n: name
303303
*/
304304
MGIS_EXPORT bool isMaterialPropertyUniform(const MaterialStateManager&,
305-
const std::string_view&);
305+
std::string_view);
306306
/*!
307307
* \brief set the mass density
308308
* \param[out] m: material state manager
@@ -345,7 +345,7 @@ namespace mgis::behaviour {
345345
*/
346346
MGIS_EXPORT void setExternalStateVariable(
347347
MaterialStateManager&,
348-
const std::string_view&,
348+
std::string_view,
349349
const real,
350350
const MaterialStateManager::UpdatePolicy = MaterialStateManager::UPDATE);
351351
/*!
@@ -358,7 +358,7 @@ namespace mgis::behaviour {
358358
*/
359359
MGIS_EXPORT void setExternalStateVariable(
360360
MaterialStateManager&,
361-
const std::string_view&,
361+
std::string_view,
362362
const std::span<mgis::real>&,
363363
const MaterialStateManager::StorageMode =
364364
MaterialStateManager::LOCAL_STORAGE,
@@ -375,7 +375,7 @@ namespace mgis::behaviour {
375375
MGIS_EXPORT [[nodiscard]] bool setExternalStateVariable(
376376
Context&,
377377
MaterialStateManager&,
378-
const std::string_view&,
378+
std::string_view,
379379
const real,
380380
const MaterialStateManager::UpdatePolicy =
381381
MaterialStateManager::UPDATE) noexcept;
@@ -392,7 +392,7 @@ namespace mgis::behaviour {
392392
MGIS_EXPORT [[nodiscard]] bool setExternalStateVariable(
393393
Context&,
394394
MaterialStateManager&,
395-
const std::string_view&,
395+
std::string_view,
396396
const std::span<mgis::real>&,
397397
const MaterialStateManager::StorageMode =
398398
MaterialStateManager::LOCAL_STORAGE,
@@ -407,21 +407,21 @@ namespace mgis::behaviour {
407407
* \param[in] n: name
408408
*/
409409
MGIS_EXPORT [[nodiscard]] bool unsetExternalStateVariable(
410-
Context&, MaterialStateManager&, const std::string_view&) noexcept;
410+
Context&, MaterialStateManager&, std::string_view) noexcept;
411411
/*!
412412
* \return true if the given external state variable is defined.
413413
* \param[out] m: material state manager
414414
* \param[in] n: name
415415
*/
416416
MGIS_EXPORT bool isExternalStateVariableDefined(const MaterialStateManager&,
417-
const std::string_view&);
417+
std::string_view);
418418
/*!
419419
* \return true if the given external state variable is uniform.
420420
* \param[out] m: material state manager
421421
* \param[in] n: name
422422
*/
423423
MGIS_EXPORT bool isExternalStateVariableUniform(const MaterialStateManager&,
424-
const std::string_view&);
424+
std::string_view);
425425
/*!
426426
* \brief update the values of a state from another state
427427
* \param[out] o: output state

‎src/MaterialStateManager.cxx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ namespace mgis::behaviour {
141141

142142
[[nodiscard]] static MaterialStateManager::FieldHolder& getFieldHolder(
143143
std::map<std::string, MaterialStateManager::FieldHolder, std::less<>>& m,
144-
const std::string_view& n) noexcept {
144+
std::string_view n) noexcept {
145145
return m[std::string{n}];
146146
} // end of getFieldHolder
147147

@@ -150,7 +150,7 @@ namespace mgis::behaviour {
150150
getFieldHolderIterator(const std::map<std::string,
151151
MaterialStateManager::FieldHolder,
152152
std::less<>>& m,
153-
const std::string_view& n) {
153+
std::string_view n) {
154154
// #if __cplusplus > 201103L
155155
// return m.find(n);
156156
// #else /* __cplusplus > 201103L */
@@ -159,7 +159,7 @@ namespace mgis::behaviour {
159159
} // end of getFieldHolder
160160

161161
void setMaterialProperty(MaterialStateManager& m,
162-
const std::string_view& n,
162+
std::string_view n,
163163
const real v,
164164
const MaterialStateManager::UpdatePolicy p) {
165165
const auto mp = getVariable(m.b.mps, n);
@@ -175,7 +175,7 @@ namespace mgis::behaviour {
175175
bool setMaterialProperty(
176176
Context& ctx,
177177
MaterialStateManager& m,
178-
const std::string_view& n,
178+
std::string_view n,
179179
const real v,
180180
const MaterialStateManager::UpdatePolicy p) noexcept {
181181
const auto omp = getVariable(ctx, m.b.mps, n);
@@ -196,7 +196,7 @@ namespace mgis::behaviour {
196196
} // end of setMaterialProperty
197197

198198
void setMaterialProperty(MaterialStateManager& m,
199-
const std::string_view& n,
199+
std::string_view n,
200200
const std::span<real>& v,
201201
const MaterialStateManager::StorageMode s,
202202
const MaterialStateManager::UpdatePolicy p) {
@@ -223,7 +223,7 @@ namespace mgis::behaviour {
223223
bool setMaterialProperty(
224224
Context& ctx,
225225
MaterialStateManager& m,
226-
const std::string_view& n,
226+
std::string_view n,
227227
const std::span<real>& v,
228228
const MaterialStateManager::StorageMode s,
229229
const MaterialStateManager::UpdatePolicy p) noexcept {
@@ -258,7 +258,7 @@ namespace mgis::behaviour {
258258

259259
bool unsetMaterialProperty(Context& ctx,
260260
MaterialStateManager& m,
261-
const std::string_view& n) noexcept {
261+
std::string_view n) noexcept {
262262
const auto omp = getVariable(ctx, m.b.mps, n);
263263
if (isInvalid(omp)) {
264264
return false;
@@ -271,13 +271,13 @@ namespace mgis::behaviour {
271271
} // end of unsetMaterialProperty
272272

273273
bool isMaterialPropertyDefined(const MaterialStateManager& m,
274-
const std::string_view& n) {
274+
std::string_view n) {
275275
const auto p = getFieldHolderIterator(m.material_properties, n);
276276
return p != m.material_properties.end();
277277
} // end of isMaterialPropertyDefined
278278

279279
bool isMaterialPropertyUniform(const MaterialStateManager& m,
280-
const std::string_view& n) {
280+
std::string_view n) {
281281
const auto p = getFieldHolderIterator(m.material_properties, n);
282282
if (p == m.material_properties.end()) {
283283
mgis::raise(
@@ -324,7 +324,7 @@ namespace mgis::behaviour {
324324
} // end of isMassDensityUniform
325325

326326
void setExternalStateVariable(MaterialStateManager& m,
327-
const std::string_view& n,
327+
std::string_view n,
328328
const real v,
329329
const MaterialStateManager::UpdatePolicy p) {
330330
const auto esv = getVariable(m.b.esvs, n);
@@ -338,7 +338,7 @@ namespace mgis::behaviour {
338338
} // end of setExternalStateVariable
339339

340340
void setExternalStateVariable(MaterialStateManager& m,
341-
const std::string_view& n,
341+
std::string_view n,
342342
const std::span<real>& v,
343343
const MaterialStateManager::StorageMode s,
344344
const MaterialStateManager::UpdatePolicy p) {
@@ -369,14 +369,14 @@ namespace mgis::behaviour {
369369
bool setExternalStateVariable(
370370
Context& ctx,
371371
MaterialStateManager& m,
372-
const std::string_view& n,
372+
std::string_view n,
373373
const real v,
374374
const MaterialStateManager::UpdatePolicy p) noexcept {
375375
const auto oesv = getVariable(ctx, m.b.esvs, n);
376376
if (isInvalid(oesv)) {
377377
return false;
378378
}
379-
if (oesv->type != Variable::SCALAR){
379+
if (oesv->type != Variable::SCALAR) {
380380
return ctx.registerErrorMessage(
381381
"setExternalStateVariable: "
382382
"invalid external state variable "
@@ -391,7 +391,7 @@ namespace mgis::behaviour {
391391
bool setExternalStateVariable(
392392
Context& ctx,
393393
MaterialStateManager& m,
394-
const std::string_view& n,
394+
std::string_view n,
395395
const std::span<real>& v,
396396
const MaterialStateManager::StorageMode s,
397397
const MaterialStateManager::UpdatePolicy p) noexcept {
@@ -430,7 +430,7 @@ namespace mgis::behaviour {
430430

431431
bool unsetExternalStateVariable(Context& ctx,
432432
MaterialStateManager& m,
433-
const std::string_view& n) noexcept {
433+
std::string_view n) noexcept {
434434
const auto oesv = getVariable(ctx, m.b.esvs, n);
435435
if (isInvalid(oesv)) {
436436
return false;
@@ -443,13 +443,13 @@ namespace mgis::behaviour {
443443
} // end of unsetExternalStateVariable
444444

445445
bool isExternalStateVariableDefined(const MaterialStateManager& m,
446-
const std::string_view& n) {
446+
std::string_view n) {
447447
const auto p = getFieldHolderIterator(m.external_state_variables, n);
448448
return p != m.external_state_variables.end();
449449
} // end of isExternalStateVariableDefined
450450

451451
bool isExternalStateVariableUniform(const MaterialStateManager& m,
452-
const std::string_view& n) {
452+
std::string_view n) {
453453
const auto p = getFieldHolderIterator(m.external_state_variables, n);
454454
mgis::raise_if(p == m.external_state_variables.end(),
455455
"isExternalStateVariableUniform: "
@@ -1027,4 +1027,4 @@ namespace mgis::behaviour {
10271027

10281028
#endif /* MGIS_HAVE_HDF5 */
10291029

1030-
} // end of namespace mgis::behaviour
1030+
} // end of namespace mgis::behaviour

0 commit comments

Comments
 (0)