From e2c9590ec070a6a492d5376c181e4531f24f0668 Mon Sep 17 00:00:00 2001
From: Kamil Cudnik <kcudnik@gmail.com>
Date: Wed, 4 Aug 2021 08:11:23 +0200
Subject: [PATCH] [vslib] Clean Sai interface include (#880)

---
 vslib/inc/sai_vs.h                  | 6 ++++--
 vslib/src/sai_vs_fdb.cpp            | 2 --
 vslib/src/sai_vs_interfacequery.cpp | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/vslib/inc/sai_vs.h b/vslib/inc/sai_vs.h
index ce19aa6ac9..442da0e06f 100644
--- a/vslib/inc/sai_vs.h
+++ b/vslib/inc/sai_vs.h
@@ -5,7 +5,9 @@ extern "C" {
 #include "saiextensions.h"
 }
 
-#include "Sai.h"
+#include "SaiInterface.h"
+
+#include "swss/logger.h"
 
 #include <memory>
 
@@ -57,7 +59,7 @@ PRIVATE extern const sai_virtual_router_api_t   vs_virtual_router_api;
 PRIVATE extern const sai_vlan_api_t             vs_vlan_api;
 PRIVATE extern const sai_wred_api_t             vs_wred_api;
 
-PRIVATE extern std::shared_ptr<saivs::Sai>      vs_sai;
+PRIVATE extern std::shared_ptr<sairedis::SaiInterface>      vs_sai;
 
 // QUAD OID
 
diff --git a/vslib/src/sai_vs_fdb.cpp b/vslib/src/sai_vs_fdb.cpp
index 3394ef245f..58a2cf8b93 100644
--- a/vslib/src/sai_vs_fdb.cpp
+++ b/vslib/src/sai_vs_fdb.cpp
@@ -1,7 +1,5 @@
 #include "sai_vs.h"
 
-using namespace saivs;
-
 static sai_status_t vs_flush_fdb_entries(
         _In_ sai_object_id_t switch_id,
         _In_ uint32_t attr_count,
diff --git a/vslib/src/sai_vs_interfacequery.cpp b/vslib/src/sai_vs_interfacequery.cpp
index 0ea644e3fa..89547561b8 100644
--- a/vslib/src/sai_vs_interfacequery.cpp
+++ b/vslib/src/sai_vs_interfacequery.cpp
@@ -1,8 +1,7 @@
 #include "sai_vs.h"
+#include "Sai.h"
 
-using namespace saivs;
-
-std::shared_ptr<Sai> vs_sai = std::make_shared<Sai>();
+std::shared_ptr<sairedis::SaiInterface> vs_sai = std::make_shared<saivs::Sai>();
 
 sai_status_t sai_api_initialize(
         _In_ uint64_t flags,