Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions DataFormats/StdDictionaries/src/classes_def_pair.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<class name="std::pair<short,short>"/>
<class name="std::pair<short,std::vector<short> >"/>
<class name="std::pair<short,unsigned int>"/>
<class name="std::pair<short,int>"/>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to make sure: here I use short, but in #47030 I used int16_t. Do I leave things as they are, or is it better to be consistent (if so, would you suggest to change type here, or in [1]) ?

[1]

typedef int16_t L1TObjBxIndexType;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm of the opinion that you should keep it the way it is. The DataFormats/StdDictionaries is meant to allow sharing of the dictionaries across different packages. If another package has the same use of std::pair they might only declare it as short. Given short is the actual fundamental type, I'd stick with that. The use of int16_t in the typedef is also useful since it is effective documentation stating why they want that size.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thanks @Dr15Jones.

<class name="std::pair<std::basic_string<char>,bool>"/>
<class name="std::pair<std::basic_string<char>,std::basic_string<char> >"/>
<class name="std::pair<std::basic_string<char>,std::map<std::basic_string<char>,std::basic_string<char> > >"/>
Expand Down
3 changes: 3 additions & 0 deletions DataFormats/StdDictionaries/src/classes_def_vector.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,7 @@
<class name="std::vector<std::unique_ptr<int> >" />
<class name="std::vector<std::pair<int,std::bitset<6> > >" />
<class name="std::pair<int,std::bitset<6>>"/>
<class name="std::vector<std::pair<short,int>>" />
<class name="std::vector<std::vector<std::pair<short,int>>>" />
<class name="std::vector<std::vector<std::vector<std::pair<short,int>>>>" />
</lcgdict>