Commit f72c977d authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Change PyCool config to make sure PyCool_helpers.h is parsed before

PyCool_headers.h by rootcling. This makes it possible to clean up
PyCool_helpers.h avoid potential conflicts within cool::PyCool::Helpers
(CORALCOOL-2757).


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19415 4525493e-7705-40b1-a816-d608a930855b
parent 3a7bbb35
...@@ -22,7 +22,7 @@ use $(select_reflex) ...@@ -22,7 +22,7 @@ use $(select_reflex)
# Make PyCool_helpers.h visible verbatim in PyCoolDict.so (bug #103539) # Make PyCool_helpers.h visible verbatim in PyCoolDict.so (bug #103539)
# See http://stackoverflow.com/questions/14802807/compare-files-date-bash # See http://stackoverflow.com/questions/14802807/compare-files-date-bash
action concatenate_headers "if [ ! -e $(PyCool_root)/$(tag)/dict/PyCool_headers_and_helpers.h ] || [ $(PyCool_root)/$(tag)/dict/PyCool_headers_and_helpers.h -ot $(PyCool_root)/dict/PyCool_headers.h ] || [ $(PyCool_root)/$(tag)/dict/PyCool_headers_and_helpers.h -ot $(RelationalCool_root)/src/PyCool_helpers.h ] ; then mkdir -p $(PyCool_root)/$(tag)/dict ; cat $(PyCool_root)/dict/PyCool_headers.h $(RelationalCool_root)/src/PyCool_helpers.h > $(PyCool_root)/$(tag)/dict/PyCool_headers_and_helpers.h ; cp $(PyCool_root)/$(tag)/dict/PyCool_headers_and_helpers.h $(CMTINSTALLAREA)/$(tag)/python/PyCool/_internal/PyCool_headers_and_helpers.h ; fi" action concatenate_headers "if [ ! -e $(PyCool_root)/$(tag)/dict/PyCool_headers_and_helpers.h ] || [ $(PyCool_root)/$(tag)/dict/PyCool_headers_and_helpers.h -ot $(PyCool_root)/dict/PyCool_headers.h ] || [ $(PyCool_root)/$(tag)/dict/PyCool_headers_and_helpers.h -ot $(RelationalCool_root)/src/PyCool_helpers.h ] ; then mkdir -p $(PyCool_root)/$(tag)/dict ; cat $(RelationalCool_root)/src/PyCool_helpers.h $(PyCool_root)/dict/PyCool_headers.h > $(PyCool_root)/$(tag)/dict/PyCool_headers_and_helpers.h ; cp $(PyCool_root)/$(tag)/dict/PyCool_headers_and_helpers.h $(CMTINSTALLAREA)/$(tag)/python/PyCool/_internal/PyCool_headers_and_helpers.h ; fi"
macro concatenate_headers_dependencies install_pythonmods macro concatenate_headers_dependencies install_pythonmods
macro lcg_PyCoolGen_dependencies concatenate_headers macro lcg_PyCoolGen_dependencies concatenate_headers
......
...@@ -97,18 +97,16 @@ namespace cool ...@@ -97,18 +97,16 @@ namespace cool
// The "exceptionThrown" string is always reset to "" at the beginning // The "exceptionThrown" string is always reset to "" at the beginning
// of this method: it is then set to a non-empty error message if an // of this method: it is then set to a non-empty error message if an
// exception is thrown (in which case a dummy retun value is returned). // exception is thrown (in which case a dummy retun value is returned).
// [NB: explicit namespace cool::IObjectPtr is required due to ROOT-7011] IObjectPtr findObjectNoThrow( IFolder* ptr,
cool::IObjectPtr findObjectNoThrow( IFolder* ptr, std::string& excThr,
std::string& excThr, const ValidityKey& pointInTime,
const ValidityKey& pointInTime, const ChannelId& channelId,
const ChannelId& channelId, const std::string& tagName );
const std::string& tagName );
// Wrapper for exceptions in IFolder::browseObjects. // Wrapper for exceptions in IFolder::browseObjects.
// The "exceptionThrown" string is always reset to "" at the beginning // The "exceptionThrown" string is always reset to "" at the beginning
// of this method: it is then set to a non-empty error message if an // of this method: it is then set to a non-empty error message if an
// exception is thrown (in which case a dummy retun value is returned). // exception is thrown (in which case a dummy retun value is returned).
// [NB: explicit namespace cool::IObjectPtr is required due to ROOT-7011]
IObjectIteratorPtr browseObjectsNoThrow( IFolder* ptr, IObjectIteratorPtr browseObjectsNoThrow( IFolder* ptr,
std::string& excThr, std::string& excThr,
const ValidityKey& since, const ValidityKey& since,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment