Egalware/Extern
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extern :

Browse Source 
- C3d aggiornamento delle librerie.
This commit is contained in:
Dario Sassi
2020-09-14 16:42:31 +00:00
parent 555eae9594
commit e8f0fa2d27
332 changed files with 59308 additions and 52918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C3d/Include/templ_csp_array.h
+9 -8
View File
@@ -16,8 +16,8 @@
FORVARD_DECL_TEMPLATE_TYPENAME( class CSPArray );
FORVARD_DECL_TEMPLATE_TYPENAME( void qp_sort( CSPArray<Type> & arr ) );
FORVARD_DECL_TEMPLATE_TYPENAME( reader& CALL_DECLARATION operator >> ( reader& in, CSPArray<Type> & ref ) );
FORVARD_DECL_TEMPLATE_TYPENAME( writer& CALL_DECLARATION operator << ( writer& out, const CSPArray<Type> & ref ) );
FORVARD_DECL_TEMPLATE_TYPENAME( reader & CALL_DECLARATION operator >> ( reader & in, CSPArray<Type> & ref ) );
FORVARD_DECL_TEMPLATE_TYPENAME( writer & CALL_DECLARATION operator << ( writer & out, const CSPArray<Type> & ref ) );
//------------------------------------------------------------------------------
@@ -85,8 +85,8 @@ public:
Type * RemoveObj( Type * delObject, DelType del ); ///< \ru Удалить элемент. \en Delete element.
TEMPLATE_FRIEND void qp_sort TEMPLATE_SUFFIX ( CSPArray<Type> & arr );
TEMPLATE_FRIEND reader& CALL_DECLARATION operator >> TEMPLATE_SUFFIX ( reader& in, CSPArray<Type> & ref );
TEMPLATE_FRIEND writer& CALL_DECLARATION operator << TEMPLATE_SUFFIX ( writer& out, const CSPArray<Type> & ref );
TEMPLATE_FRIEND reader & CALL_DECLARATION operator >> TEMPLATE_SUFFIX ( reader & in, CSPArray<Type> & ref );
TEMPLATE_FRIEND writer & CALL_DECLARATION operator << TEMPLATE_SUFFIX ( writer & out, const CSPArray<Type> & ref );
private:
/// \ru Сортировка с выбором удаляемого элемента из двух одинаковых. \en Sort with the choice of the element to remove from the two identical.
@@ -100,7 +100,7 @@ private:
// \ru добавление объекта в массив \en adding an object to array
// ---
template <class Type>
inline Type* CSPArray<Type>::Add( Type * el )
inline Type * CSPArray<Type>::Add( Type * el )
{
//::qp_sort( *this );
Sort();
@@ -112,7 +112,7 @@ inline Type* CSPArray<Type>::Add( Type * el )
// \ru добавление объекта в массив \en adding an object to array
// ---
template <class Type>
inline Type* CSPArray<Type>::Add( Type * el, size_t & indexEl )
inline Type * CSPArray<Type>::Add( Type * el, size_t & indexEl )
{
//::qp_sort( *this );
Sort();
@@ -124,7 +124,7 @@ inline Type* CSPArray<Type>::Add( Type * el, size_t & indexEl )
// \ru поиск объекта в массиве \en search of an element in array
// ---
template <class Type>
inline size_t /*OV_x64 int*/ CSPArray<Type>::Find( const Type * el )
inline size_t CSPArray<Type>::Find( const Type * el )
{
// ::qp_sort( *this );
Sort();
@@ -179,7 +179,8 @@ inline void CSPArray<Type>::Sort( LessFuncPtr lessFunc )
// \ru удалить элемент из массива (по указателю) \en delete an element from array (by the pointer)
// ---
template <class Type>
inline Type* CSPArray<Type>::RemoveObj( Type *delObject, DelType del ) {
inline Type * CSPArray<Type>::RemoveObj( Type * delObject, DelType del )
{
C3D_ASSERT( SPArray<Type>::nowDeletedElem == 0 ); // \ru Bременно, для отладки \en Temporarily, for debugging.
size_t i = Find( delObject );
return ( i != SYS_MAX_T ) ? RemoveInd(i, del) : 0;