Skip to content

[CPP20][ALCA] Replace some enums with constexpr ints #44509

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

Merged
cmsbuild merged 1 commit into from
Mar 28, 2024
Merged

[CPP20][ALCA] Replace some enums with constexpr ints #44509

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
32 changes: 16 additions & 16 deletions Alignment/Geners/interface/IOTraits.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace gs {
template <class T>
struct IOTraits {
static const bool IsClass = IOIsClassType<T>::value;
enum { ISCLASS = 1 };
static constexpr int ISCLASS = 1;

// Pointers are not PODs for I/O purposes.
//
Expand All @@ -30,59 +30,59 @@ namespace gs {
// that we need to avoid.
static const bool IsPOD =
(IOIsPOD<T>::value && !IOIsContainer<T>::value && !CPP11_is_pointer<T>::value && !IOIsExternal<T>::value);
enum { ISPOD = 2 };
static constexpr int ISPOD = 2;

static const bool IsWritable = (IOIsWritable<T>::value && !IOIsExternal<T>::value);
enum { ISWRITABLE = 4 };
static constexpr int ISWRITABLE = 4;

static const bool IsStdContainer = (IOIsContainer<T>::value && !IOIsWritable<T>::value && !IOIsExternal<T>::value);
enum { ISSTDCONTAINER = 8 };
static constexpr int ISSTDCONTAINER = 8;

// Readable objects are required to be writable
static const bool IsPlaceReadable = (IOIsPlaceReadable<T>::value && IOIsWritable<T>::value);
enum { ISPLACEREADABLE = 16 };
static constexpr int ISPLACEREADABLE = 16;

// Prefer place readability to heap readability
static const bool IsHeapReadable =
(IOIsHeapReadable<T>::value && !IOIsPlaceReadable<T>::value && IOIsWritable<T>::value);
enum { ISHEAPREADABLE = 32 };
static constexpr int ISHEAPREADABLE = 32;

static const bool IsPointer = (CPP11_is_pointer<T>::value && !IOIsExternal<T>::value);
enum { ISPOINTER = 64 };
static constexpr int ISPOINTER = 64;

static const bool IsSharedPtr = (IOIsSharedPtr<T>::value && !IOIsExternal<T>::value);
enum { ISSHAREDPTR = 128 };
static constexpr int ISSHAREDPTR = 128;

static const bool IsPair = IOIsPair<T>::value;
enum { ISPAIR = 256 };
static constexpr int ISPAIR = 256;

static const bool IsString = IOIsString<T>::value;
enum { ISSTRING = 512 };
static constexpr int ISSTRING = 512;

// The following trait is relevant for containers only
static const bool IsContiguous = IOIsContiguous<T>::value;
enum { ISCONTIGUOUS = 1024 };
static constexpr int ISCONTIGUOUS = 1024;

static const bool IsTuple = IOIsTuple<T>::value;
enum { ISTUPLE = 2048 };
static constexpr int ISTUPLE = 2048;

static const bool IsIOPtr = IOIsIOPtr<T>::value;
enum { ISIOPTR = 4096 };
static constexpr int ISIOPTR = 4096;

// A catch-all definition for externally defined types which
// want to use the template-based I/O within this system but
// do not want to implement the standard "read/write" mechanism.
// The user has to declare the external type by modifying the
// "IOIsExternal" template.
static const bool IsExternal = IOIsExternal<T>::value;
enum { ISEXTERNAL = 8192 };
static constexpr int ISEXTERNAL = 8192;

// Special enums for heap-readable objects known
// to be called with zero pointer as an argument.
// In this case we will avoid compiling an assignment
// operator for the object.
enum { ISNULLPOINTER = 16384 };
enum { ISPUREHEAPREADABLE = 32768 };
static constexpr int ISNULLPOINTER = 16384;
static constexpr int ISPUREHEAPREADABLE = 32768;

static const int Signature = IsClass * ISCLASS + IsPOD * ISPOD + IsWritable * ISWRITABLE +
IsStdContainer * ISSTDCONTAINER + IsPlaceReadable * ISPLACEREADABLE +
Expand Down
6 changes: 4 additions & 2 deletions CalibFormats/SiStripObjects/interface/SiStripRegionCabling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
class SiStripRegionCabling {
public:
/** enums */
enum SubDet { TIB = 0, TOB = 1, TID = 2, TEC = 3, ALLSUBDETS = 4 };
enum Layer { TIBLAYERS = 4, TOBLAYERS = 6, TIDLAYERS = 3, TECLAYERS = 9, ALLLAYERS = 10 };
typedef int SubDet;
static constexpr int TIB = 0, TOB = 1, TID = 2, TEC = 3, ALLSUBDETS = 4;
typedef int Layer;
static constexpr int TIBLAYERS = 4, TOBLAYERS = 6, TIDLAYERS = 3, TECLAYERS = 9, ALLLAYERS = 10;

/** Cabling typedefs */
typedef std::pair<uint32_t, std::vector<FedChannelConnection>> Element;
Expand Down