neoml-lib · yekatkov · Jan 14, 2021 · Jan 19, 2021 · Feb 15, 2021 · Feb 19, 2021
diff --git a/NeoMathEngine/src/CPU/x86/CpuX86.h b/NeoMathEngine/src/CPU/x86/CpuX86.h
@@ -328,7 +328,7 @@ template<class T>
 inline void dataCopy(T* dst, const T* src, int vectorSize)
 {
 	if( vectorSize > 0 ) {
-		memcpy( dst, src, vectorSize * sizeof( T ) );
+		std::copy_n( src, vectorSize, dst );
 	}
 
 }

diff --git a/NeoMathEngine/src/CPU/x86/avx/src/PrimitivesJit.h b/NeoMathEngine/src/CPU/x86/avx/src/PrimitivesJit.h
@@ -64,14 +64,14 @@ class CPrimitivesJit {
 		bool isMultithread );
 
 	template<CPrimitivesJit::TPrimitive P>
-	const uint8_t* GetFunctionRawPtr() {
+	void* GetFunctionRawPtr() {
 		CGenerator& genInst = gens[static_cast< size_t >( P )];
 		genInst.lock.lock();
 		if( genInst.gen.getSize() == 0 ) {
 			initPrimitive<P>();
 		}
 		genInst.lock.unlock();
-		return genInst.gen.getCode();
+		return reinterpret_cast<void*>( const_cast<uint8_t*>( genInst.gen.getCode() ) );
 	}
 
 private: