diff options
| author | Lalit Maganti <lalitm@google.com> | 2023-05-16 12:06:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-05-16 12:06:28 +0000 |
| commit | 90667b7d13cd0025906f388f24d2901192ab2d95 (patch) | |
| tree | 8b16e4efca886c4e740ed9a0d988fde542ca1aa7 | |
| parent | 16b4bf02a1e939970ef0c8236468b4e0aba4f880 (diff) | |
| parent | 0c5acff6f9965a6a06443e4afd75edb1ee039842 (diff) | |
| download | perfetto-90667b7d13cd0025906f388f24d2901192ab2d95.tar.gz | |
Merge "tp: fix compile errors in G3"
| -rw-r--r-- | src/trace_processor/db/sorting_overlay.h | 4 | ||||
| -rw-r--r-- | src/trace_processor/prelude/functions/utils.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/trace_processor/db/sorting_overlay.h b/src/trace_processor/db/sorting_overlay.h index 4d490e395..7b536a1c2 100644 --- a/src/trace_processor/db/sorting_overlay.h +++ b/src/trace_processor/db/sorting_overlay.h @@ -31,8 +31,8 @@ namespace column { class SortingOverlay : public ColumnOverlay { public: explicit SortingOverlay(ColumnOverlay* ancestor); - void Filter(FilterOp, SqlValue, RowMap&) override; - void StableSort(uint32_t* rows_order, uint32_t rows_size) override; + void Filter(FilterOp, SqlValue, RowMap&) const override; + void StableSort(uint32_t* rows_order, uint32_t rows_size) const override; private: std::unique_ptr<ColumnOverlay> inner_; diff --git a/src/trace_processor/prelude/functions/utils.h b/src/trace_processor/prelude/functions/utils.h index 21fed04be..ac848d094 100644 --- a/src/trace_processor/prelude/functions/utils.h +++ b/src/trace_processor/prelude/functions/utils.h @@ -19,6 +19,7 @@ #include <sqlite3.h> #include <unordered_map> + #include "perfetto/ext/base/base64.h" #include "perfetto/ext/base/file_utils.h" #include "perfetto/ext/trace_processor/demangle.h" @@ -26,9 +27,9 @@ #include "src/trace_processor/export_json.h" #include "src/trace_processor/importers/common/clock_tracker.h" #include "src/trace_processor/prelude/functions/create_function_internal.h" -#include "src/trace_processor/util/status_macros.h" - #include "src/trace_processor/prelude/functions/sql_function.h" +#include "src/trace_processor/sqlite/sqlite_utils.h" +#include "src/trace_processor/util/status_macros.h" namespace perfetto { namespace trace_processor { |