fix bad rebase

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -3335,7 +3335,6 @@ consteval auto getIndexTargets()
 //
 // The columns of this table have to be CCDB_COLUMNS so that for each timestamp, we get a row
 // which points to the specified CCDB objectes described by those columns.
-<<<<<<< HEAD
 #define DECLARE_SOA_TIMESTAMPED_TABLE_FULL(_Name_, _Label_, _TimestampSource_, _TimestampColumn_, _UniformitySource_, _UniformityColumn_, _Version_, _Desc_, ...) \
   O2HASH(_Desc_ "/" #_Version_);                                                                                                                              \
   template <typename O>                                                                                                                                       \
@@ -3350,10 +3349,10 @@ consteval auto getIndexTargets()
     template <typename O = o2::aod::Hash<"AOD"                                                                                                                \
                                          ""_h>>                                                                                                               \
     using extension_table_t = _Name_##TimestampFrom<O>;                                                                                                       \
-    static constexpr const auto ccdb_urls = []<typename... Cs>(framework::pack<Cs...>) {                                                                      \
+    static constexpr const auto ccdb_urls = []<typename... Cs>(framework::pack<Cs...>) consteval {                                                            \
       return std::array<std::string_view, sizeof...(Cs)>{Cs::query...};                                                                                       \
     }(framework::pack<__VA_ARGS__>{});                                                                                                                        \
-    static constexpr const auto ccdb_bindings = []<typename... Cs>(framework::pack<Cs...>) {                                                                  \
+    static constexpr const auto ccdb_bindings = []<typename... Cs>(framework::pack<Cs...>) consteval {                                                        \
       return std::array<std::string_view, sizeof...(Cs)>{Cs::mLabel...};                                                                                      \
     }(framework::pack<__VA_ARGS__>{});                                                                                                                        \
     /* The uniformity column may live in a table other than the timestamp source (the run  */                                                                 \
@@ -3384,46 +3383,6 @@ consteval auto getIndexTargets()
   using _Name_##From = o2::soa::Join<_TimestampSource_, _Name_##TimestampFrom<O>>;                                                                            \
   using _Name_ = _Name_##From<o2::aod::Hash<                                                                                                                  \
     "AOD"                                                                                                                                                     \
-=======
-#define DECLARE_SOA_TIMESTAMPED_TABLE_FULL(_Name_, _Label_, _TimestampSource_, _TimestampColumn_, _Version_, _Desc_, ...) \
-  O2HASH(_Desc_ "/" #_Version_);                                                                                          \
-  template <typename O>                                                                                                   \
-  using _Name_##TimestampFrom = soa::Table<o2::aod::Hash<_Label_ ""_h>, o2::aod::Hash<_Desc_ "/" #_Version_ ""_h>, O>;    \
-  using _Name_##Timestamp = _Name_##TimestampFrom<o2::aod::Hash<                                                          \
-    "AOD"                                                                                                                 \
-    ""_h>>;                                                                                                               \
-  struct _Name_##TimestampMetadata : TableMetadata<o2::aod::Hash<_Desc_ "/" #_Version_ ""_h>, __VA_ARGS__> {              \
-    template <typename O = o2::aod::Hash<"AOD"                                                                            \
-                                         ""_h>>                                                                           \
-    using base_table_t = _TimestampSource_##From<O>;                                                                      \
-    template <typename O = o2::aod::Hash<"AOD"                                                                            \
-                                         ""_h>>                                                                           \
-    using extension_table_t = _Name_##TimestampFrom<O>;                                                                   \
-    static constexpr const auto ccdb_urls = []<typename... Cs>(framework::pack<Cs...>) consteval {                        \
-      return std::array<std::string_view, sizeof...(Cs)>{Cs::query...};                                                   \
-    }(framework::pack<__VA_ARGS__>{});                                                                                    \
-    static constexpr const auto ccdb_bindings = []<typename... Cs>(framework::pack<Cs...>) consteval {                    \
-      return std::array<std::string_view, sizeof...(Cs)>{Cs::mLabel...};                                                  \
-    }(framework::pack<__VA_ARGS__>{});                                                                                    \
-    static constexpr auto N = _TimestampSource_::originals.size();                                                        \
-    template <o2::aod::is_origin_hash O = o2::aod::Hash<"AOD"_h>>                                                         \
-    static consteval auto generateSources()                                                                               \
-    {                                                                                                                     \
-      return _TimestampSource_##From<O>::originals;                                                                       \
-    }                                                                                                                     \
-    static constexpr auto timestamp_column_label = _TimestampColumn_::mLabel;                                             \
-    /*static constexpr auto timestampColumn = _TimestampColumn_;*/                                                        \
-  };                                                                                                                      \
-  template <>                                                                                                             \
-  struct MetadataTrait<o2::aod::Hash<_Desc_ "/" #_Version_ ""_h>> {                                                       \
-    static constexpr void isMetadataTrait() {};                                                                           \
-    using metadata = _Name_##TimestampMetadata;                                                                           \
-  };                                                                                                                      \
-  template <typename O>                                                                                                   \
-  using _Name_##From = o2::soa::Join<_TimestampSource_, _Name_##TimestampFrom<O>>;                                        \
-  using _Name_ = _Name_##From<o2::aod::Hash<                                                                              \
-    "AOD"                                                                                                                 \
->>>>>>> e3a4b50a1b (DPL Analysis: explicitly mark lambdas as constexpr/consteval)
     ""_h>>;
 
 /* Uniformity defaults to the timestamp column of the timestamp source: each distinct