Reimport boost/any as a separate project

3 files changed, 6 insertions, 6 deletions

diff --git a/library/cpp/netliba/v6/ib_cs.cpp b/library/cpp/netliba/v6/ib_cs.cpp
index 6dbe7bb0e5..1b904e3358 100644
--- a/library/cpp/netliba/v6/ib_cs.cpp
+++ b/library/cpp/netliba/v6/ib_cs.cpp
@@ -420,7 +420,7 @@ namespace NNetliba {
                             TCmdBufferReady ready;
                             ready.Command = CMD_BUFFER_READY;
                             ready.PacketGuid = data.PacketGuid;
-                            ready.RemoteAddr = blk->GetData() - (char*)nullptr;
+                            ready.RemoteAddr = reinterpret_cast<ui64>(blk->GetData()) / sizeof(char);
                             ready.RemoteKey = blk->GetMemRegion()->GetRKey();
 
                             peer->PostSend(BP, &ready, sizeof(ready), TCompleteInfo::CI_IGNORE, 0);
diff --git a/library/cpp/netliba/v6/ib_low.h b/library/cpp/netliba/v6/ib_low.h
index b2a3e341d2..04f4a08d3c 100644
--- a/library/cpp/netliba/v6/ib_low.h
+++ b/library/cpp/netliba/v6/ib_low.h
@@ -227,8 +227,8 @@ namespace NNetliba {
             return MR ? (char*)MR->addr : nullptr;
         }
         bool IsCovered(const void* data, size_t len) const {
-            size_t dataAddr = (const char*)data - (const char*)nullptr;
-            size_t bufAddr = (const char*)MR->addr - (const char*)nullptr;
+            size_t dataAddr = reinterpret_cast<size_t>(data) / sizeof(char);
+            size_t bufAddr = reinterpret_cast<size_t>(MR->addr) / sizeof(char);
             return (dataAddr >= bufAddr) && (dataAddr + len <= bufAddr + MR->length);
         }
     };
@@ -264,7 +264,7 @@ namespace NNetliba {
             Y_ASSERT(mem->IsCovered(buf, len));
             ibv_recv_wr wr, *bad;
             ibv_sge sg;
-            sg.addr = (const char*)buf - (const char*)nullptr;
+            sg.addr = reinterpret_cast<ui64>(buf) / sizeof(char);
             sg.length = len;
             sg.lkey = mem->GetLKey();
             Zero(wr);
@@ -413,7 +413,7 @@ namespace NNetliba {
         }
         void FillSendAttrs(ibv_send_wr* wr, ibv_sge* sg,
                            TPtrArg<TMemoryRegion> mem, ui64 id, const void* data, size_t len) {
-            ui64 localAddr = (const char*)data - (const char*)nullptr;
+            ui64 localAddr = reinterpret_cast<ui64>(data) / sizeof(char);
             ui32 lKey = 0;
             if (mem) {
                 Y_ASSERT(mem->IsCovered(data, len));
diff --git a/library/cpp/netliba/v6/ib_mem.h b/library/cpp/netliba/v6/ib_mem.h
index dfa5b9cd5f..5adcc59dd7 100644
--- a/library/cpp/netliba/v6/ib_mem.h
+++ b/library/cpp/netliba/v6/ib_mem.h
@@ -54,7 +54,7 @@ namespace NNetliba {
             return Data;
         }
         ui64 GetAddr() {
-            return Data - (char*)nullptr;
+            return reinterpret_cast<ui64>(Data) / sizeof(char);
         }
         size_t GetSize() {
             return Size;