Author: bhavani Date: Tue Dec 20 18:20:00 2011 New Revision: 1221405 URL: http://svn.apache.org/viewvc?rev=1221405&view=rev Log: UIMA-2307 linux build failed due to unnecessary qualifier in copyToArray and copyFromArray method declaration
Modified: uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp Modified: uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp?rev=1221405&r1=1221404&r2=1221405&view=diff ============================================================================== --- uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp (original) +++ uima/uimacpp/trunk/src/cas/uima/lowlevel_fsheap.hpp Tue Dec 20 18:20:00 2011 @@ -611,56 +611,56 @@ namespace uima { double getDouble(TyHeapCell offset); - void FSHeap::copyFromArray(TyHeapCell sourceArray[], size_t srcOffset, TyHeapCell tyCell, size_t destOffset, size_t numelements) { + void copyFromArray(TyHeapCell sourceArray[], size_t srcOffset, TyHeapCell tyCell, size_t destOffset, size_t numelements) { TyHeapCell * ptr = getCArrayFromFS(tyCell); if(ptr!=NULL) { memcpy(ptr + destOffset, sourceArray + srcOffset, numelements*sizeof(TyHeapCell)); } } - void FSHeap::copyFromArray(char sourceArray[], size_t srcOffset, TyHeapCell tyCell, size_t destOffset, size_t numelements) { + void copyFromArray(char sourceArray[], size_t srcOffset, TyHeapCell tyCell, size_t destOffset, size_t numelements) { char * ptr = const_cast<char*>(get8BitArray(tyCell)); if(ptr!=NULL) { memcpy(ptr + destOffset, sourceArray + srcOffset, numelements); } } - void FSHeap::copyFromArray(short sourceArray[], size_t srcOffset, TyHeapCell tyCell, size_t destOffset, size_t numelements) { + void copyFromArray(short sourceArray[], size_t srcOffset, TyHeapCell tyCell, size_t destOffset, size_t numelements) { short * ptr = const_cast<short*>(get16BitArray(tyCell)); if(ptr!=NULL) { memcpy(ptr + destOffset, sourceArray + srcOffset, numelements * sizeof(short)); } } - void FSHeap::copyFromArray(INT64 sourceArray[], size_t srcOffset, TyHeapCell tyCell, size_t destOffset, size_t numelements) { + void copyFromArray(INT64 sourceArray[], size_t srcOffset, TyHeapCell tyCell, size_t destOffset, size_t numelements) { INT64 * ptr = const_cast<INT64*>(get64BitArray(tyCell)); if(ptr!=NULL) { memcpy(ptr + destOffset, sourceArray + srcOffset, numelements * sizeof(INT64)); } } - void FSHeap::copyToArray(size_t srcOffset, TyHeapCell tyCell, char destArray[], size_t destOffset, size_t numelements) { + void copyToArray(size_t srcOffset, TyHeapCell tyCell, char destArray[], size_t destOffset, size_t numelements) { char * ptr = const_cast<char*>(get8BitArray(tyCell)); if(ptr!=NULL) { memcpy(destArray + destOffset, ptr + srcOffset, numelements); } } - void FSHeap::copyToArray(size_t srcOffset, TyHeapCell tyCell, TyHeapCell destArray[], size_t destOffset, size_t numelements) { + void copyToArray(size_t srcOffset, TyHeapCell tyCell, TyHeapCell destArray[], size_t destOffset, size_t numelements) { TyHeapCell * ptr = const_cast<TyHeapCell*>(getCArrayFromFS(tyCell)); if(ptr!=NULL) { memcpy(destArray + destOffset, ptr + srcOffset, numelements*sizeof(TyHeapCell) ); } } - void FSHeap::copyToArray(size_t srcOffset, TyHeapCell tyCell, short destArray[], size_t destOffset, size_t numelements) { + void copyToArray(size_t srcOffset, TyHeapCell tyCell, short destArray[], size_t destOffset, size_t numelements) { short * ptr = const_cast<short*>(get16BitArray(tyCell)); if(ptr!=NULL) { memcpy(destArray + destOffset, ptr + srcOffset, numelements*sizeof(short) ); } } - void FSHeap::copyToArray(size_t srcOffset, TyHeapCell tyCell, INT64 destArray[], size_t destOffset, size_t numelements) { + void copyToArray(size_t srcOffset, TyHeapCell tyCell, INT64 destArray[], size_t destOffset, size_t numelements) { INT64 * ptr = const_cast<INT64*>(get64BitArray(tyCell)); if(ptr!=NULL) { memcpy(destArray + destOffset, ptr + srcOffset, numelements*sizeof(INT64) );