Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ntuple] Move STL dictionary entries to separate file #14072

Merged
merged 1 commit into from
Nov 21, 2023
Merged

[ntuple] Move STL dictionary entries to separate file #14072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tree/ntuple/v7/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ ROOT_ADD_GTEST(ntuple_modelext ntuple_modelext.cxx LIBRARIES ROOTNTuple MathCore
ROOT_ADD_GTEST(ntuple_serialize ntuple_serialize.cxx LIBRARIES ROOTNTuple CustomStruct)
if(NOT MSVC OR llvm13_broken_tests)
ROOT_ADD_GTEST(ntuple_types ntuple_types.cxx LIBRARIES ROOTNTuple CustomStruct)
ROOT_GENERATE_DICTIONARY(ProxiedSTLContainerDict ${CMAKE_CURRENT_SOURCE_DIR}/ProxiedSTLContainer.hxx
MODULE ntuple_types
LINKDEF ProxiedSTLContainerLinkDef.h
OPTIONS -inlineInputHeader
DEPENDENCIES CustomStruct)
endif()
ROOT_ADD_GTEST(ntuple_view ntuple_view.cxx LIBRARIES ROOTNTuple CustomStruct)
ROOT_ADD_GTEST(ntuple_zip ntuple_zip.cxx LIBRARIES ROOTNTuple CustomStruct)
Expand Down
13 changes: 0 additions & 13 deletions tree/ntuple/v7/test/CustomStructLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,6 @@
#pragma link C++ class ConstructorTraits + ;
#pragma link C++ class DestructorTraits + ;

#pragma link C++ class std::set<std::int64_t> +;
#pragma link C++ class std::set<std::string> +;
#pragma link C++ class std::set<float> +;
#pragma link C++ class std::set<std::set<CustomStruct>> +;
#pragma link C++ class std::set<std::set<char>> +;
#pragma link C++ class std::set<std::pair<int, CustomStruct>> +;

#pragma link C++ class std::unordered_set<std::int64_t> +;
#pragma link C++ class std::unordered_set<std::string> +;
#pragma link C++ class std::unordered_set<float> +;
#pragma link C++ class std::unordered_set<CustomStruct> +;
#pragma link C++ class std::unordered_set<std::vector<bool>> +;

#pragma link C++ options = version(3) class StructWithIORulesBase + ;
#pragma link C++ options = version(3) class StructWithTransientString + ;
#pragma link C++ options = version(3) class StructWithIORules + ;
Expand Down
9 changes: 9 additions & 0 deletions tree/ntuple/v7/test/ProxiedSTLContainer.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#ifndef ROOT7_RNTuple_Test_ProxiedSTLContainer
#define ROOT7_RNTuple_Test_ProxiedSTLContainer

#include "CustomStruct.hxx"

#include <set>
#include <unordered_set>

#endif // ROOT7_RNTuple_Test_ProxiedSTLContainer
20 changes: 20 additions & 0 deletions tree/ntuple/v7/test/ProxiedSTLContainerLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#ifdef __CLING__

#pragma link off all globals;
#pragma link off all classes;
#pragma link off all functions;

#pragma link C++ class std::set<std::int64_t>+;
#pragma link C++ class std::set<std::string>+;
#pragma link C++ class std::set<float>+;
#pragma link C++ class std::set<std::set<CustomStruct>>+;
#pragma link C++ class std::set<std::set<char>>+;
#pragma link C++ class std::set<std::pair<int, CustomStruct>>+;

#pragma link C++ class std::unordered_set<std::int64_t>+;
#pragma link C++ class std::unordered_set<std::string>+;
#pragma link C++ class std::unordered_set<float>+;
#pragma link C++ class std::unordered_set<CustomStruct>+;
#pragma link C++ class std::unordered_set<std::vector<bool>>+;

#endif