more clang fixes

Signed-off-by: Gavin Halliday <[email protected]>

Author: ghalliday

roxie/roxiemem/roxiemem.cpp

@@ -7054,7 +7054,7 @@ class SimpleRowBuffer : implements IBufferedRowCallback
 };
 
 // A row buffer which does not allocate memory for the row array from roxiemem
-class TestingRowBuffer : implements IBufferedRowCallback
+class TestingRowBuffer final : implements IBufferedRowCallback
 {
 public:
     TestingRowBuffer(unsigned _cost, unsigned _id) : cost(_cost), id(_id)
@@ -7136,7 +7136,7 @@ class CallbackBlockAllocator : implements IBufferedRowCallback
 
 
 //Free the block as soon as requested
-class SimpleCallbackBlockAllocator : public CallbackBlockAllocator
+class SimpleCallbackBlockAllocator final : public CallbackBlockAllocator
 {
 public:
     SimpleCallbackBlockAllocator(IRowManager * _rowManager, memsize_t _size, unsigned _cost, unsigned _id)
@@ -7154,7 +7154,7 @@ class SimpleCallbackBlockAllocator : public CallbackBlockAllocator
 };
 
 //Allocate another row before disposing of the first
-class NastyCallbackBlockAllocator : public CallbackBlockAllocator
+class NastyCallbackBlockAllocator final : public CallbackBlockAllocator
 {
 public:
     NastyCallbackBlockAllocator(IRowManager * _rowManager, unsigned _size, unsigned _cost, unsigned _id)

system/jlib/jevent.cpp

@@ -329,7 +329,8 @@ constexpr size32_t getSizeOfAttr(T arg)
 
 constexpr size32_t getSizeOfAttr(const char * arg)
 {
-    return sizeof(EventAttr) + strlen(arg) + 1;
+    //strlen is a constexpr in gcc, but not in clang
+    return sizeof(EventAttr) + std::char_traits<char>::length(arg) + 1;
 }
 
 template<typename... Args>
@@ -433,7 +434,7 @@ void EventRecorder::writeEventHeader(EventType type, offset_type & offset)
     }
     if (options & ERFthreadid)
     {
-        __uint64 threadId = GetCurrentThreadId();
+        __uint64 threadId = (__uint64)GetCurrentThreadId();
         write(offset, threadId);
     }
 }