io: old StreamerInfo read/write 64 bit collections

Author: pcanal

io/io/src/TStreamerInfoReadBuffer.cxx

@@ -1192,10 +1192,10 @@ Int_t TStreamerInfo::ReadBuffer(TBuffer &b, const T &arr,
                               cont = contp[j];
                            }
                            TVirtualCollectionProxy::TPushPop helper( newProxy, cont );
-                           Int_t nobjects;
-                           b >> nobjects;
-                           env = newProxy->Allocate(nobjects,true);
-                           if (!nobjects && (vers>=7)) {
+                           ULong64_t nobjects64 = TStreamerInfoUtils::ReadCollectionSize(b, vers);
+
+                           env = newProxy->Allocate(nobjects64,true);
+                           if (!nobjects64 && (vers>=7)) {
                               // Do nothing but in version 6 of TStreamerInfo and below,
                               // we were calling ReadBuffer for empty collection.
                            } else {
@@ -1303,7 +1303,7 @@ Int_t TStreamerInfo::ReadBuffer(TBuffer &b, const T &arr,
                         for(; obj<end; obj+=objectSize) {
                            TVirtualCollectionProxy::TPushPop helper( newProxy, obj );
                            ULong64_t nobjects64 = TStreamerInfoUtils::ReadCollectionSize(b, vers);
-                           R__ASSERT(nobjects64 <= (ULong64_t)std::numeric_limits<Int_t>::max() && "Allocate is not yet 64 bit enabled");
+
                            void* env = newProxy->Allocate(nobjects64, true);
                            if (!nobjects64 && (vers>=7)) {
                               // Do nothing but in version 6 of TStreamerInfo and below,

io/io/src/TStreamerInfoWriteBuffer.cxx

@@ -17,6 +17,7 @@
 #include "TStreamer.h"
 #include "TStreamerElement.h"
 #include "TStreamerInfo.h"
+#include "TStreamerInfoCollectionUtils.h"
 #include "TVirtualCollectionProxy.h"
 #include "TRefTable.h"
 #include "TFile.h"
@@ -523,9 +524,9 @@ Int_t TStreamerInfo::WriteBufferAux(TBuffer &b, const T &arr,
                      for(int j=0;j<compinfo[i]->fLength;++j) {
                         char *cont = contp[j];
                         TVirtualCollectionProxy::TPushPop helper( proxy, cont );
-                        Int_t nobjects = cont ? proxy->Size() : 0;
-                        b << nobjects;
-                        if (nobjects) {
+                        ULong64_t nobjects64 = cont ? proxy->Size() : 0;
+                        TStreamerInfoUtils::WriteCollectionSize(b, nobjects64);
+                        if (nobjects64) {
                            auto actions = proxy->GetWriteMemberWiseActions();
 
                            char startbuf[TVirtualCollectionProxy::fgIteratorArenaSize];
@@ -587,9 +588,9 @@ Int_t TStreamerInfo::WriteBufferAux(TBuffer &b, const T &arr,
 
                      for(Int_t j=0; j<n; j++,obj+=size) {
                         TVirtualCollectionProxy::TPushPop helper( proxy, obj );
-                        Int_t nobjects = proxy->Size();
-                        b << nobjects;
-                        if (nobjects) {
+                        ULong64_t nobjects64 = proxy->Size();
+                        TStreamerInfoUtils::WriteCollectionSize(b, nobjects64);
+                        if (nobjects64) {
                            auto actions = proxy->GetWriteMemberWiseActions();
 
                            char startbuf[TVirtualCollectionProxy::fgIteratorArenaSize];