Blob Blame History Raw
diff -ur root-6.24.02.orig/bindings/pyroot_legacy/ROOT.py root-6.24.02/bindings/pyroot_legacy/ROOT.py
--- root-6.24.02.orig/bindings/pyroot_legacy/ROOT.py	2021-06-28 11:17:14.000000000 +0200
+++ root-6.24.02/bindings/pyroot_legacy/ROOT.py	2021-08-11 10:44:16.895804556 +0200
@@ -438,9 +438,7 @@
 # This function is injected as method to the respective classes in Pythonize.cxx.
 _root._RDataFrameAsNumpy = _RDataFrameAsNumpy
 
-# This Pythonisation is there only for 64 bits builds
-if (sys.maxsize > 2**32): # https://docs.python.org/3/library/platform.html#cross-platform
-    _root.CreateScopeProxy( "TTree" ).AsMatrix = _TTreeAsMatrix
+_root.CreateScopeProxy( "TTree" ).AsMatrix = _TTreeAsMatrix
 
 
 ### RINT command emulation ------------------------------------------------------
diff -ur root-6.24.02.orig/build/unix/makepchinput.py root-6.24.02/build/unix/makepchinput.py
--- root-6.24.02.orig/build/unix/makepchinput.py	2021-06-28 11:17:14.000000000 +0200
+++ root-6.24.02/build/unix/makepchinput.py	2021-08-11 10:44:16.926804638 +0200
@@ -252,9 +252,6 @@
                            "math/vdt",
                            "tmva/rmva"]
 
-   if (sys.platform != 'win32' and sys.maxsize <= 2**32): # https://docs.python.org/3/library/platform.html#cross-platform
-      PCHPatternsBlacklist.append("tree/dataframe")
-
    accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
                not isAnyPatternInString(PCHPatternsBlacklist,dirName)
 
diff -ur root-6.24.02.orig/tree/dataframe/test/dataframe_cache.cxx root-6.24.02/tree/dataframe/test/dataframe_cache.cxx
--- root-6.24.02.orig/tree/dataframe/test/dataframe_cache.cxx	2021-06-28 11:17:14.000000000 +0200
+++ root-6.24.02/tree/dataframe/test/dataframe_cache.cxx	2021-08-11 10:44:16.927804641 +0200
@@ -224,8 +224,6 @@
 
 }
 
-#ifdef R__B64
-
 TEST(Cache, Regex)
 {
 
@@ -335,8 +333,6 @@
    gSystem->Unlink(fileName);
 }
 
-#endif // R__B64
-
 // ROOT-10563
 TEST(Cache, Alias)
 {
diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_arrow.cxx root-6.24.02/tree/dataframe/test/datasource_arrow.cxx
--- root-6.24.02.orig/tree/dataframe/test/datasource_arrow.cxx	2021-06-28 11:17:14.000000000 +0200
+++ root-6.24.02/tree/dataframe/test/datasource_arrow.cxx	2021-08-11 10:44:16.927804641 +0200
@@ -177,8 +177,6 @@
 }
 #endif
 
-#ifdef R__B64
-
 TEST(RArrowDS, FromARDF)
 {
    std::unique_ptr<RDataSource> tds(new RArrowDS(createTestTable(), {}));
@@ -250,5 +248,3 @@
 }
 
 #endif // R__USE_IMT
-
-#endif // R__B64
diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_csv.cxx root-6.24.02/tree/dataframe/test/datasource_csv.cxx
--- root-6.24.02.orig/tree/dataframe/test/datasource_csv.cxx	2021-06-28 11:17:14.000000000 +0200
+++ root-6.24.02/tree/dataframe/test/datasource_csv.cxx	2021-08-11 10:44:16.927804641 +0200
@@ -207,8 +207,6 @@
 }
 #endif
 
-#ifdef R__B64
-
 TEST(RCsvDS, FromARDF)
 {
    std::unique_ptr<RDataSource> tds(new RCsvDS(fileName0));
@@ -321,5 +319,3 @@
 }
 
 #endif // R__USE_IMT
-
-#endif // R__B64
diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_root.cxx root-6.24.02/tree/dataframe/test/datasource_root.cxx
--- root-6.24.02.orig/tree/dataframe/test/datasource_root.cxx	2021-06-28 11:17:14.000000000 +0200
+++ root-6.24.02/tree/dataframe/test/datasource_root.cxx	2021-08-11 10:44:16.928804644 +0200
@@ -117,8 +117,6 @@
 }
 #endif
 
-#ifdef R__B64
-
 TEST(TRootTDS, FromARDF)
 {
    std::unique_ptr<RDataSource> tds(new RRootDS(treeName, fileGlob));
@@ -190,5 +188,3 @@
 }
 
 #endif // R__USE_IMT
-
-#endif // R__B64
diff -ur root-6.24.02.orig/tree/dataframe/test/datasource_trivial.cxx root-6.24.02/tree/dataframe/test/datasource_trivial.cxx
--- root-6.24.02.orig/tree/dataframe/test/datasource_trivial.cxx	2021-06-28 11:17:14.000000000 +0200
+++ root-6.24.02/tree/dataframe/test/datasource_trivial.cxx	2021-08-11 10:44:16.928804644 +0200
@@ -141,8 +141,6 @@
    EXPECT_EQ(df.Range(10).Count().GetValue(), 10);
 }
 
-#ifdef R__B64
-
 TEST(RTrivialDS, FromARDFWithJitting)
 {
    std::unique_ptr<RDataSource> tds(new RTrivialDS(32));
@@ -245,5 +243,3 @@
 }
 
 #endif // R__USE_IMT
-
-#endif // R__B64
diff -ur root-6.24.02.orig/tutorials/CMakeLists.txt root-6.24.02/tutorials/CMakeLists.txt
--- root-6.24.02.orig/tutorials/CMakeLists.txt	2021-06-28 11:17:14.000000000 +0200
+++ root-6.24.02/tutorials/CMakeLists.txt	2021-08-11 10:44:16.974804766 +0200
@@ -279,10 +279,6 @@
   list(APPEND root7_veto ${v7_veto_files})
 endif()
 
-if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
-  set(bits32_veto dataframe/*.C graphs/timeSeriesFrom*.C v7/ntuple/ntpl004_dimuon.C)
-endif()
-
 #---These ones are disabled !!! ------------------------------------
 set(extra_veto
   legacy/benchmarks.C
@@ -335,7 +331,6 @@
              ${classic_veto}
              ${pythia_veto}
              ${root7_veto}
-             ${bits32_veto}
              ${xrootd_veto}
              ${mlp_veto}
              ${spectrum_veto}