Commit d7c22a54 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov

залил нехорошую версию до этого

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@60408 954022d7-b5bf-4e40-9824-e11837661b57
parent 22c64454
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
#include "Types.h" #include "Types.h"
#include <string.h> #include <string.h>
#ifdef _LINUX
#include "string.h"
#endif
#if 0 //__APPLE__ #if 0 //__APPLE__
...@@ -116,6 +113,7 @@ private: ...@@ -116,6 +113,7 @@ private:
}; };
#else #else
#include <stdlib.h>
template <class T> template <class T>
class CArray class CArray
...@@ -191,7 +189,7 @@ public: ...@@ -191,7 +189,7 @@ public:
return FALSE; return FALSE;
m_nAllocSize = nNewAllocSize; m_nAllocSize = nNewAllocSize;
m_nSize = 0; m_nSize = nNewAllocSize;
} }
return TRUE; return TRUE;
...@@ -301,7 +299,7 @@ private: ...@@ -301,7 +299,7 @@ private:
#ifdef WIN32 #ifdef WIN32
memmove_s((void*)dst, nCount * sizeof(T), (void*)src, nCount * sizeof(T)); memmove_s((void*)dst, nCount * sizeof(T), (void*)src, nCount * sizeof(T));
#else #else
memmove((void*)dst, (void*)(m_aT + nNewCount), nCount * sizeof(T)); memmove((void*)dst, (void*)src, nCount * sizeof(T));
#endif #endif
} }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment