From 686d5011df607fde2a42c729d6bd446486163784 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Fri, 13 Mar 2020 16:20:17 +0100
Subject: [PATCH] Restore 32-bit dataframe

---
 build/unix/makepchinput.py                 | 3 ---
 cmake/modules/RootBuildOptions.cmake       | 5 -----
 tree/dataframe/test/dataframe_cache.cxx    | 4 ----
 tree/dataframe/test/datasource_arrow.cxx   | 4 ----
 tree/dataframe/test/datasource_csv.cxx     | 4 ----
 tree/dataframe/test/datasource_root.cxx    | 4 ----
 tree/dataframe/test/datasource_trivial.cxx | 4 ----
 tutorials/CMakeLists.txt                   | 5 -----
 8 files changed, 33 deletions(-)

diff --git a/build/unix/makepchinput.py b/build/unix/makepchinput.py
index 1adff487de..eec73f946d 100755
--- a/build/unix/makepchinput.py
+++ b/build/unix/makepchinput.py
@@ -252,9 +252,6 @@ def isDirForPCH(dirName, legacyPyROOT):
                            "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 --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake
index 7886c5f3e9..6fbd8873f1 100644
--- a/cmake/modules/RootBuildOptions.cmake
+++ b/cmake/modules/RootBuildOptions.cmake
@@ -344,11 +344,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
   set(runtime_cxxmodules_defvalue OFF)
 endif()
 
-# Disable RDataFrame on 32-bit UNIX platforms due to ROOT-9236
-if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-    set(dataframe_defvalue OFF)
-endif()
-
 # MultiProcess is not possible on Windows, so fail if it is manually set:
 if(roofit_multiprocess AND WIN32)
     message(FATAL_ERROR ">>> Option 'roofit_multiprocess' is not supported on Windows.")
diff --git a/tree/dataframe/test/dataframe_cache.cxx b/tree/dataframe/test/dataframe_cache.cxx
index 77be488052..8475b98acb 100644
--- a/tree/dataframe/test/dataframe_cache.cxx
+++ b/tree/dataframe/test/dataframe_cache.cxx
@@ -224,8 +224,6 @@ TEST(Cache, evtCounter)
 
 }
 
-#ifdef R__B64
-
 TEST(Cache, Regex)
 {
 
@@ -329,8 +327,6 @@ TEST(Cache, Carrays)
    gSystem->Unlink(fileName);
 }
 
-#endif // R__B64
-
 // ROOT-10563
 TEST(Cache, Alias)
 {
diff --git a/tree/dataframe/test/datasource_arrow.cxx b/tree/dataframe/test/datasource_arrow.cxx
index 5ac9fcf09a..5f5f94a666 100644
--- a/tree/dataframe/test/datasource_arrow.cxx
+++ b/tree/dataframe/test/datasource_arrow.cxx
@@ -177,8 +177,6 @@ TEST(RArrowDS, SetNSlotsTwice)
 }
 #endif
 
-#ifdef R__B64
-
 TEST(RArrowDS, FromARDF)
 {
    std::unique_ptr<RDataSource> tds(new RArrowDS(createTestTable(), {}));
@@ -250,5 +248,3 @@ TEST(RArrowDS, FromARDFWithJittingMT)
 }
 
 #endif // R__USE_IMT
-
-#endif // R__B64
diff --git a/tree/dataframe/test/datasource_csv.cxx b/tree/dataframe/test/datasource_csv.cxx
index 6554719f98..d93117b67a 100644
--- a/tree/dataframe/test/datasource_csv.cxx
+++ b/tree/dataframe/test/datasource_csv.cxx
@@ -210,8 +210,6 @@ TEST(RCsvDS, SetNSlotsTwice)
 }
 #endif
 
-#ifdef R__B64
-
 TEST(RCsvDS, FromARDF)
 {
    std::unique_ptr<RDataSource> tds(new RCsvDS(fileName0));
@@ -324,5 +322,3 @@ TEST(RCsvDS, ProgressiveReadingRDFMT)
 }
 
 #endif // R__USE_IMT
-
-#endif // R__B64
diff --git a/tree/dataframe/test/datasource_root.cxx b/tree/dataframe/test/datasource_root.cxx
index 79840d9fff..4c795fee6f 100644
--- a/tree/dataframe/test/datasource_root.cxx
+++ b/tree/dataframe/test/datasource_root.cxx
@@ -117,8 +117,6 @@ TEST(TRootTDS, SetNSlotsTwice)
 }
 #endif
 
-#ifdef R__B64
-
 TEST(TRootTDS, FromARDF)
 {
    std::unique_ptr<RDataSource> tds(new ROOT::Internal::RDF::RRootDS(treeName, fileGlob));
@@ -190,5 +188,3 @@ TEST(TRootTDS, FromARDFWithJittingMT)
 }
 
 #endif // R__USE_IMT
-
-#endif // R__B64
diff --git a/tree/dataframe/test/datasource_trivial.cxx b/tree/dataframe/test/datasource_trivial.cxx
index 7da675c83b..deb89301c7 100644
--- a/tree/dataframe/test/datasource_trivial.cxx
+++ b/tree/dataframe/test/datasource_trivial.cxx
@@ -141,8 +141,6 @@ TEST(RTrivialDS, EarlyQuitWithRange)
    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 @@ TEST(RTrivialDS, SkipEntriesMT)
 }
 
 #endif // R__USE_IMT
-
-#endif // R__B64
diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
index a6e5c97703..12bb610d67 100644
--- a/tutorials/CMakeLists.txt
+++ b/tutorials/CMakeLists.txt
@@ -332,10 +332,6 @@ else()
   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()
-
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64)
    set(macm1_veto dataframe/df107_SingleTopAnalysis.py)
 endif()
@@ -391,7 +387,6 @@ set(all_veto hsimple.C
              ${classic_veto}
              ${pythia_veto}
              ${root7_veto}
-             ${bits32_veto}
              ${xrootd_veto}
              ${mlp_veto}
              ${spectrum_veto}
-- 
2.35.1