Skip to content
Snippets Groups Projects
Commit bb187223 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'charstar.RootUtils-20201205' into 'master'

RootUtils: Remove kCharStar from the list of root types we handle.

See merge request atlas/athena!38905
parents e48b2b2f 1e10eaa2
No related branches found
No related tags found
No related merge requests found
...@@ -20,8 +20,11 @@ TYPE1(kShort_t, short); // 2 ...@@ -20,8 +20,11 @@ TYPE1(kShort_t, short); // 2
TYPE1(kInt_t, int); // 3 TYPE1(kInt_t, int); // 3
TYPE1(kLong_t, long); // 4 TYPE1(kLong_t, long); // 4
TYPE1(kFloat_t, float); // 5 TYPE1(kFloat_t, float); // 5
TYPE1(kCounter, int); // 6 TYPE1(kCounter, int); // 6
TYPE1(kCharStar, char*); // 7 // kCharStar can't really be treated like the other types; further, it leads
// to compilation failures with gcc11. But we don't actually need it,
// so just remove it.
//TYPE1(kCharStar, char*); // 7
TYPE1(kDouble_t, double); // 8 TYPE1(kDouble_t, double); // 8
TYPE1(kDouble32_t, Double32_t); // 9 TYPE1(kDouble32_t, Double32_t); // 9
TYPE (kchar, char, int); // 10 TYPE (kchar, char, int); // 10
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment