Skip to content

Commit 3d506f5

Browse files
Merge pull request #1195 from arcaneframework/dev/gg-remote-fields-of-componentiteminternal
Remove fields of 'ComponentItemInternal' and store values as arrays in 'ComponentItemSharedInfo'.
2 parents de119ea + 0d02919 commit 3d506f5

9 files changed

+315
-114
lines changed

arcane/src/arcane/core/ItemInternal.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* ItemInternal.h (C) 2000-2023 */
8+
/* ItemInternal.h (C) 2000-2024 */
99
/* */
1010
/* Partie interne d'une entité. */
1111
/*---------------------------------------------------------------------------*/
@@ -58,6 +58,7 @@ class PolyhedralMeshImpl;
5858
namespace Arcane::Materials
5959
{
6060
class ComponentItemInternal;
61+
class ComponentItemSharedInfo;
6162
}
6263
namespace Arcane
6364
{
@@ -481,6 +482,7 @@ class ARCANE_CORE_EXPORT ItemBase
481482
friend class ::Arcane::Item;
482483
friend class ::Arcane::ItemInternalCompatibility;
483484
friend class ::Arcane::Materials::ComponentItemInternal;
485+
friend class ::Arcane::Materials::ComponentItemSharedInfo;
484486
friend MutableItemBase;
485487

486488
private:

arcane/src/arcane/core/materials/ComponentItemInternal.cc

-12
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@ ComponentItemSharedInfo* ComponentItemSharedInfo::null_shared_info_pointer = &Co
3333
/*---------------------------------------------------------------------------*/
3434
/*---------------------------------------------------------------------------*/
3535

36-
void ComponentItemInternal::
37-
_throwBadCast(Int32 v)
38-
{
39-
throw BadCastException(A_FUNCINFO,String::format("Can not cast v={0} to type 'Int16'",v));
40-
}
41-
42-
void matimpl::ConstituentItemBase::
43-
_throwBadCast(Int32 v)
44-
{
45-
throw BadCastException(A_FUNCINFO,String::format("Can not cast v={0} to type 'Int16'",v));
46-
}
47-
4836
std::ostream&
4937
operator<<(std::ostream& o,const ComponentItemInternalLocalId& id)
5038
{

0 commit comments

Comments
 (0)