From 5df10a5e2762f9632fadaf3938b25c239ca45b5d Mon Sep 17 00:00:00 2001 From: Jacob Alber Date: Wed, 14 Feb 2024 15:31:50 -0500 Subject: [PATCH] fix: api_status.h macros colide between VW and RL --- .../include/vw/fb_parser/parse_example_flatbuffer.h | 6 ++++-- vowpalwabbit/fb_parser/src/parse_example_flatbuffer.cc | 1 + vowpalwabbit/fb_parser/src/parse_label.cc | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/vowpalwabbit/fb_parser/include/vw/fb_parser/parse_example_flatbuffer.h b/vowpalwabbit/fb_parser/include/vw/fb_parser/parse_example_flatbuffer.h index 70836775c22..b7f45a7c92a 100644 --- a/vowpalwabbit/fb_parser/include/vw/fb_parser/parse_example_flatbuffer.h +++ b/vowpalwabbit/fb_parser/include/vw/fb_parser/parse_example_flatbuffer.h @@ -4,7 +4,6 @@ #pragma once -#include "vw/core/api_status.h" #include "vw/core/example.h" #include "vw/core/multi_ex.h" #include "vw/core/shared_data.h" @@ -14,7 +13,10 @@ namespace VW { -class api_status; +namespace experimental +{ + class api_status; +} using example_sink_f = std::function; diff --git a/vowpalwabbit/fb_parser/src/parse_example_flatbuffer.cc b/vowpalwabbit/fb_parser/src/parse_example_flatbuffer.cc index 23719c9e432..fbbcccfdaaf 100644 --- a/vowpalwabbit/fb_parser/src/parse_example_flatbuffer.cc +++ b/vowpalwabbit/fb_parser/src/parse_example_flatbuffer.cc @@ -4,6 +4,7 @@ #include "vw/fb_parser/parse_example_flatbuffer.h" +#include "vw/core/api_status.h" #include "vw/core/action_score.h" #include "vw/core/best_constant.h" #include "vw/core/cb.h" diff --git a/vowpalwabbit/fb_parser/src/parse_label.cc b/vowpalwabbit/fb_parser/src/parse_label.cc index c236747569f..505384a6c2e 100644 --- a/vowpalwabbit/fb_parser/src/parse_label.cc +++ b/vowpalwabbit/fb_parser/src/parse_label.cc @@ -2,6 +2,7 @@ // individual contributors. All rights reserved. Released under a BSD (revised) // license as described in the file LICENSE. +#include "vw/core/api_status.h" #include "vw/core/action_score.h" #include "vw/core/best_constant.h" #include "vw/core/cb.h"