Merged conflicts with matej's push

pvDataApp/pvTest/testIntTypes.cpp

@@ -10,7 +10,7 @@
 #include <epicsAssert.h>
 
 #include "requester.h"
-#include "pvIntrospect.h"
+#include "pvTypes.h"
 
 using namespace epics::pvData;
 
@@ -26,6 +26,8 @@ int main(int argc,char *argv[])
     assert(sizeof(int16)==2);
     assert(sizeof(int32)==4);
     assert(sizeof(int64)==8);
+    assert(sizeof(uint32)==4);
+    assert(sizeof(uint64)==8);
 
     int intValue;
     int8 byteInt;