[meta] Add back the ROOT-5768 test

fixes #11484
root-project · Feb 15, 2024 · 1fd257b · 1fd257b
1 parent 4eba391
commit 1fd257b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 49 deletions.
diff --git a/root/meta/genreflex/ROOT-5768/CMakeLists.txt b/root/meta/genreflex/ROOT-5768/CMakeLists.txt
@@ -0,0 +1,7 @@
+#-------------------------------------------------------------------------------
+#
+# Placeholder file to translate the tests to the new CTest system. Meanwhile we
+# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
+#
+#-------------------------------------------------------------------------------
+ROOTTEST_ADD_OLDTEST()
diff --git a/root/meta/genreflex/ROOT-5768/CoolKernel/pointers.h b/root/meta/genreflex/ROOT-5768/CoolKernel/pointers.h
@@ -6,11 +6,7 @@
 #include "CoolKernel/VersionInfo.h"
 
 // Include files
-#ifdef COOL_HAS_CPP11
 #include <memory>
-#else
-#include <boost/shared_ptr.hpp>
-#endif
 #include <vector>
 
 namespace cool 
@@ -39,8 +35,6 @@ namespace cool
 #ifdef COOL300
   class ITransaction;
 #endif
-
-#ifdef COOL_HAS_CPP11
   // STD shared pointers
   typedef std::shared_ptr<IDatabase> IDatabasePtr;
   typedef std::shared_ptr<IFolder> IFolderPtr;
@@ -55,22 +49,6 @@ namespace cool
 #ifdef COOL300
   typedef std::shared_ptr<ITransaction> ITransactionPtr;
 #endif
-#else
-  // Boost shared pointers
-  typedef boost::shared_ptr<IDatabase> IDatabasePtr;
-  typedef boost::shared_ptr<IFolder> IFolderPtr;
-  typedef boost::shared_ptr<IFolderSet> IFolderSetPtr;
-  typedef boost::shared_ptr<IObject> IObjectPtr;
-  typedef boost::shared_ptr<IObjectIterator> IObjectIteratorPtr;
-  typedef std::vector<IObjectPtr> IObjectVector;
-  typedef boost::shared_ptr<IObjectVector> IObjectVectorPtr;
-  typedef boost::shared_ptr<IRecord> IRecordPtr;
-  typedef std::vector<IRecordPtr> IRecordVector;
-  typedef boost::shared_ptr<IRecordVector> IRecordVectorPtr;
-#ifdef COOL300
-  typedef boost::shared_ptr<ITransaction> ITransactionPtr;
-#endif
-#endif
 
 }
 

diff --git a/root/meta/genreflex/ROOT-5768/Makefile b/root/meta/genreflex/ROOT-5768/Makefile
@@ -1,27 +1,21 @@
 #Disable until boost is not present in the headers
-test:
-	@echo nothing > /dev/null
+CLEAN_TARGETS += *.log dummy* *pcm *o *rflx.* $(ALL_LIBRARIES)
+TEST_TARGETS += execLibLoad
 
-clean:
-	@echo nothing > /dev/null
+ifeq ($(strip $(ROOTTEST_HOME)),)
+  export ROOTTEST_HOME := $(shell git rev-parse --show-toplevel)/
+  ifeq ($(strip $(ROOTTEST_HOME)),)
+     export ROOTTEST_HOME := $(shell expr $(CURDIR) : '\(.*/roottest/\)')
+  endif
+  ifeq ($(strip $(ROOTTEST_HOME)),)
+     $(error The head of roottest was not found.  Set ROOTTEST_HOME)
+  endif
+endif
 
-#CLEAN_TARGETS += *.log dummy* *pcm *o *rflx.* $(ALL_LIBRARIES)
-#TEST_TARGETS += execLibLoad
+include $(ROOTTEST_HOME)/scripts/Rules.mk
+include $(ROOTTEST_HOME)/scripts/Reflex.mk
 
-#ifeq ($(strip $(ROOTTEST_HOME)),)
-#   export ROOTTEST_HOME := $(shell git rev-parse --show-toplevel)/
-#   ifeq ($(strip $(ROOTTEST_HOME)),)
-#      export ROOTTEST_HOME := $(shell expr $(CURDIR) : '\(.*/roottest/\)')
-#   endif
-#   ifeq ($(strip $(ROOTTEST_HOME)),)
-#      $(error The head of roottest was not found.  Set ROOTTEST_HOME)
-#   endif
-#endif
+GENREFLEXCXXFLAGS += --interpreteronly -I ./ -I CoralBase
+CXXFLAGS += -I ./ -I CoralBase 
 
-#include $(ROOTTEST_HOME)/scripts/Rules.mk
-#include $(ROOTTEST_HOME)/scripts/Reflex.mk
-
-#GENREFLEXCXXFLAGS += --interpreteronly -I ./ -I CoralBase
-#CXXFLAGS += -I ./ -I CoralBase 
-
-#execLibLoad.log: PyCool_rflx.$(ObjSuf)
+execLibLoad.log: PyCool_rflx.$(ObjSuf)
diff --git a/root/meta/genreflex/ROOT-5768/PyCool.h b/root/meta/genreflex/ROOT-5768/PyCool.h
@@ -147,7 +147,7 @@
 #include "CoolApplication/MessageLevels.h"
 
 // RelationalCool helpers for PyCool
-#include "../RelationalCool/src/PyCool_helpers.h"
+#include "RelationalCool/src/PyCool_helpers.h"
 
 // Pythonize a subset of CORAL RelationalAccess too
 #include "RelationalAccess/IConnectionService.h"
@@ -196,10 +196,6 @@ namespace dummy
 
     std::type_info                *aTypeInfo;
 
-#ifndef COOL_HAS_CPP11
-    boost::detail::shared_count aSharedCount;
-#endif
-
     coral::Blob aBlob;
     //coral::Date                   aDate;
     //coral::TimeStamp              aTimeStamp;

diff --git a/root/meta/genreflex/ROOT-5768/PyCool_selection.xml b/root/meta/genreflex/ROOT-5768/PyCool_selection.xml
@@ -67,5 +67,10 @@
     <variable pattern="cool::SChar*" />
     <!-- Workaround for bug #44524 on Windows (thanks to Axel!) -->
     <!--class pattern="boost::detail::sp*" /-->
+
+    <!-- Exclusions for GH issue #11484 -->
+    <class pattern="std::unique_ptr<*"/>
+    <class pattern="*__shared_ptr_default_*"/>
+    <class pattern="std::shared_ptr<*"/>
   </exclusion>
 </lcgdict>