diff --git a/src/Quantity/Quantity_Convert.cxx b/src/Quantity/Quantity_Convert.cxx index 47799ead4c..5ab4ceacd7 100644 --- a/src/Quantity/Quantity_Convert.cxx +++ b/src/Quantity/Quantity_Convert.cxx @@ -115,7 +115,7 @@ Standard_Boolean Quantity_Convert::IsPhysicalQuantity Standard_Boolean Find = Standard_False; while (i <= 68 && !Find) { - if (IsSimilar(anEnum.ToCString(),theEnums[i-1])) + if (IsEqual(anEnum.ToCString(),theEnums[i-1])) Find = Standard_True; else i++; diff --git a/src/Standard/Standard_Address.hxx b/src/Standard/Standard_Address.hxx index 2663762049..6328037139 100644 --- a/src/Standard/Standard_Address.hxx +++ b/src/Standard/Standard_Address.hxx @@ -31,14 +31,6 @@ inline Standard_Integer HashCode (const Standard_Address Value, return HashCode( ( ( U.I[0] ^ U.I[1] ) & 0x7fffffff ) , Upper ) ; } - -//============================================================================ -//==== IsSimilar : Returns Standard_True if two booleans have the same value -//============================================================================ -inline Standard_Boolean IsSimilar(const Standard_Address One - ,const Standard_Address Two) -{ return One == Two; } - //============================================================================ // IsEqual : Returns Standard_True if two CString have the same value //============================================================================ diff --git a/src/Standard/Standard_CString.hxx b/src/Standard/Standard_CString.hxx index 5e9fb14af5..f28414f0bd 100644 --- a/src/Standard/Standard_CString.hxx +++ b/src/Standard/Standard_CString.hxx @@ -32,8 +32,6 @@ # include # endif -inline Standard_Boolean IsSimilar(const Standard_CString One - ,const Standard_CString Two); __Standard_API Standard_Integer HashCode (const Standard_CString, const Standard_Integer); inline Standard_Integer HashCode (const Standard_CString, @@ -54,9 +52,9 @@ __Standard_API int Fprintf (FILE* theFile, const char* theFormat, ...); __Standard_API int Sprintf (char* theBuffer, const char* theFormat, ...); //============================================================================ -//==== IsSimilar : Returns Standard_True if two booleans have the same value +//==== IsEqual : Returns Standard_True if two booleans have the same value //============================================================================ -inline Standard_Boolean IsSimilar(const Standard_CString One +inline Standard_Boolean IsEqual(const Standard_CString One ,const Standard_CString Two) { return (strcmp(One,Two) == 0); diff --git a/src/Standard/Standard_Character.hxx b/src/Standard/Standard_Character.hxx index 75d8e9313a..4a794a8fee 100644 --- a/src/Standard/Standard_Character.hxx +++ b/src/Standard/Standard_Character.hxx @@ -36,13 +36,6 @@ inline Standard_Boolean IsEqual(const Standard_Character One, const Standard_Character Two) { return One == Two; } -// ------------------------------------------------------------------ -// IsSimilar : Returns Standard_True if two characters have the same value -// ------------------------------------------------------------------ -inline Standard_Boolean IsSimilar(const Standard_Character One, - const Standard_Character Two) -{ return One == Two; } - // =============================================== // Character classification functions // diff --git a/src/Standard/Standard_ExtCharacter.hxx b/src/Standard/Standard_ExtCharacter.hxx index 65b7f45636..f42fbbdcf4 100644 --- a/src/Standard/Standard_ExtCharacter.hxx +++ b/src/Standard/Standard_ExtCharacter.hxx @@ -66,11 +66,4 @@ inline Standard_Boolean IsEqual(const Standard_ExtCharacter One, const Standard_ExtCharacter Two) { return One == Two; } -// ------------------------------------------------------------------ -// IsSimilar : Returns Standard_True if two characters have the same value -// ------------------------------------------------------------------ -inline Standard_Boolean IsSimilar(const Standard_ExtCharacter One, - const Standard_ExtCharacter Two) -{ return One == Two; } - #endif diff --git a/src/Standard/Standard_Integer.hxx b/src/Standard/Standard_Integer.hxx index 674e1b3ca9..6d5261136f 100755 --- a/src/Standard/Standard_Integer.hxx +++ b/src/Standard/Standard_Integer.hxx @@ -69,14 +69,6 @@ inline Standard_Boolean IsEqual (const Standard_Utf32Char theOne, } #endif -// ------------------------------------------------------------------ -// IsSimilar : Returns Standard_True if two integers are equal -// ------------------------------------------------------------------ -inline Standard_Boolean IsSimilar (const Standard_Integer One, - const Standard_Integer Two) -{ return One == Two; } - - // ------------------------------------------------------------------ // IsEven : Returns Standard_True if an integer is even // ------------------------------------------------------------------ diff --git a/src/Standard/Standard_Real.hxx b/src/Standard/Standard_Real.hxx index 1dc7008c23..fb94a5c9bf 100644 --- a/src/Standard/Standard_Real.hxx +++ b/src/Standard/Standard_Real.hxx @@ -25,7 +25,6 @@ // Methods from Standard_Entity class which are redefined: // - Hascode // - IsEqual -// - IsSimilar // =============================================== // ================================== @@ -64,15 +63,6 @@ inline Standard_Boolean IsEqual (const Standard_Real Value1, const Standard_Real Value2) { return Abs((Value1 - Value2)) < RealSmall(); } -//------------------------------------------------------------------- -// IsSimilar : Returns Standard_True if two reals are equal -//------------------------------------------------------------------- -inline Standard_Boolean IsSimilar(const Standard_Real One, - const Standard_Real Two) -{ return IsEqual (One,Two); } - - - // *********************************** // // Class methods // // // diff --git a/src/Standard/Standard_ShortReal.hxx b/src/Standard/Standard_ShortReal.hxx index 7abf1daf9f..8d1af2074a 100644 --- a/src/Standard/Standard_ShortReal.hxx +++ b/src/Standard/Standard_ShortReal.hxx @@ -133,7 +133,6 @@ inline Standard_ShortReal Min (const Standard_ShortReal Val1, // Methods from Standard_Entity class which are redefined: // - Hascode // - IsEqual -// - IsSimilar // =============================================== // ================================== @@ -148,13 +147,6 @@ inline Standard_Boolean IsEqual (const Standard_ShortReal Value1, const Standard_ShortReal Value2) { return Abs((Value1 - Value2)) < ShortRealSmall(); } -//------------------------------------------------------------------- -// IsSimilar : Returns Standard_True if two ShortReals are equal -//------------------------------------------------------------------- -inline Standard_Boolean IsSimilar(const Standard_ShortReal One, - const Standard_ShortReal Two) -{ return IsEqual (One,Two); } - #endif diff --git a/src/Standard/Standard_Transient.cxx b/src/Standard/Standard_Transient.cxx index 4a3aaf312e..e209c78452 100644 --- a/src/Standard/Standard_Transient.cxx +++ b/src/Standard/Standard_Transient.cxx @@ -41,7 +41,7 @@ Standard_Boolean Standard_Transient::IsInstance(const Handle(Standard_Type) &ATy // Standard_Boolean Standard_Transient::IsInstance(const Standard_CString theTypeName) const { - return IsSimilar ( DynamicType()->Name(), theTypeName ); + return IsEqual ( DynamicType()->Name(), theTypeName ); } // diff --git a/src/Standard/Standard_Type.cxx b/src/Standard/Standard_Type.cxx index 5e823851a3..c7ac3cdc9d 100644 --- a/src/Standard/Standard_Type.cxx +++ b/src/Standard/Standard_Type.cxx @@ -30,7 +30,7 @@ Standard_Boolean Standard_Type::SubType (const Handle(Standard_Type)& theOther) Standard_Boolean Standard_Type::SubType (const Standard_CString theName) const { - return theName != 0 && (IsSimilar (myName, theName) || (! myParent.IsNull() && myParent->SubType (theName))); + return theName != 0 && (IsEqual (myName, theName) || (! myParent.IsNull() && myParent->SubType (theName))); } // ------------------------------------------------------------------