Skip to content

Commit 38a7a9b

Browse files
committed
Undid some recent deprecation warnings since it caused compilation problems on linux.
1 parent 321eb61 commit 38a7a9b

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

FEBioMech/FEBioMechModule.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,9 +1116,9 @@ void FEBioMech::InitModule()
11161116
REGISTER_FECORE_CLASS(FELogElemDevStrainEnergyDensity, "devsed");
11171117
REGISTER_FECORE_CLASS(FELogElemFiberStretch, "fiber_stretch");
11181118
REGISTER_FECORE_CLASS(FELogElemFiberVector, "fiber vector");
1119-
REGISTER_FECORE_CLASS_T(FELogElemFiberVector_N, 0, "fiber_x", 0x040E); // deprecated in version 4.14
1120-
REGISTER_FECORE_CLASS_T(FELogElemFiberVector_N, 1, "fiber_y", 0x040E); // deprecated in version 4.14
1121-
REGISTER_FECORE_CLASS_T(FELogElemFiberVector_N, 2, "fiber_z", 0x040E); // deprecated in version 4.14
1119+
REGISTER_FECORE_CLASS_T(FELogElemFiberVector_N, 0, "fiber_x");
1120+
REGISTER_FECORE_CLASS_T(FELogElemFiberVector_N, 1, "fiber_y");
1121+
REGISTER_FECORE_CLASS_T(FELogElemFiberVector_N, 2, "fiber_z");
11221122
REGISTER_FECORE_CLASS(FELogDamage, "D");
11231123
REGISTER_FECORE_CLASS_T(FELogDamage_n, 0, "damage_1");
11241124
REGISTER_FECORE_CLASS_T(FELogDamage_n, 1, "damage_2");
@@ -1140,15 +1140,15 @@ void FEBioMech::InitModule()
11401140
REGISTER_FECORE_CLASS(FELogMaxContactGap, "max contact gap");
11411141
REGISTER_FECORE_CLASS(FELogElementMixtureStress, "mixture_stress");
11421142
REGISTER_FECORE_CLASS(FELogTotalDeformationGradient, "Ft");
1143-
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 0, 0, "Ft_xx", 0x040E); // deprecated in version 4.14
1144-
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 0, 1, "Ft_xy", 0x040E); // deprecated in version 4.14
1145-
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 0, 2, "Ft_xz", 0x040E); // deprecated in version 4.14
1146-
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 1, 0, "Ft_yx", 0x040E); // deprecated in version 4.14
1147-
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 1, 1, "Ft_yy", 0x040E); // deprecated in version 4.14
1148-
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 1, 2, "Ft_yz", 0x040E); // deprecated in version 4.14
1149-
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 2, 0, "Ft_zx", 0x040E); // deprecated in version 4.14
1150-
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 2, 1, "Ft_zy", 0x040E); // deprecated in version 4.14
1151-
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 2, 2, "Ft_zz", 0x040E); // deprecated in version 4.14
1143+
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 0, 0, "Ft_xx");
1144+
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 0, 1, "Ft_xy");
1145+
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 0, 2, "Ft_xz");
1146+
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 1, 0, "Ft_yx");
1147+
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 1, 1, "Ft_yy");
1148+
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 1, 2, "Ft_yz");
1149+
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 2, 0, "Ft_zx");
1150+
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 2, 1, "Ft_zy");
1151+
REGISTER_FECORE_CLASS_T2(FELogTotalDeformationGradient_T, 2, 2, "Ft_zz");
11521152

11531153
// derived from FELogDomainData
11541154
REGISTER_FECORE_CLASS(FELogNormalizedInternalEnergy, "normalized internal energy");

FECore/FECoreKernel.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,13 @@ template <typename T> class FERegisterClass_T : public FECoreFactory
243243

244244
//-----------------------------------------------------------------------------
245245
// version for classes that require template arguments
246-
#define REGISTER_FECORE_CLASS_T(theClass, theArg, theName, ...) \
247-
static FERegisterClass_T<theClass<theArg> > _##theClass##theArg##_rc(theClass<theArg>::superClassID(), #theClass, theClass<theArg>::BaseClassName(), theName, __VA_ARGS__);
246+
#define REGISTER_FECORE_CLASS_T(theClass, theArg, theName) \
247+
static FERegisterClass_T<theClass<theArg> > _##theClass##theArg##_rc(theClass<theArg>::superClassID(), #theClass, theClass<theArg>::BaseClassName(), theName);
248248

249249
//-----------------------------------------------------------------------------
250250
// version for classes that require template arguments
251-
#define REGISTER_FECORE_CLASS_T2(theClass, theArg1, theArg2, theName, ...) \
252-
static FERegisterClass_T<theClass<theArg1, theArg2> > _##theClass##theArg1##theArg2##_rc(theClass<theArg1, theArg2>::superClassID(), #theClass, theClass<theArg1, theArg2>::BaseClassName(), theName, __VA_ARGS__);
251+
#define REGISTER_FECORE_CLASS_T2(theClass, theArg1, theArg2, theName) \
252+
static FERegisterClass_T<theClass<theArg1, theArg2> > _##theClass##theArg1##theArg2##_rc(theClass<theArg1, theArg2>::superClassID(), #theClass, theClass<theArg1, theArg2>::BaseClassName(), theName);
253253

254254
//-----------------------------------------------------------------------------
255255
// Create an instance of a class.

0 commit comments

Comments
 (0)