From 0cf59807fa364b11de65dc3f1e1c2d2bc7dd87a2 Mon Sep 17 00:00:00 2001
From: Rusty Wagner <rusty@vector35.com>
Date: Fri, 8 May 2020 05:26:56 -0400
Subject: Modifications for supporting jemalloc in the core

---
 highlevelilinstruction.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'highlevelilinstruction.cpp')

diff --git a/highlevelilinstruction.cpp b/highlevelilinstruction.cpp
index 88f833e0..d7d1c6aa 100644
--- a/highlevelilinstruction.cpp
+++ b/highlevelilinstruction.cpp
@@ -30,7 +30,9 @@ using namespace BinaryNinjaCore;
 using namespace BinaryNinja;
 #endif
 
+#ifndef BINARYNINJACORE_LIBRARY
 using namespace std;
+#endif
 
 
 unordered_map<HighLevelILOperandUsage, HighLevelILOperandType>
@@ -2320,7 +2322,7 @@ ExprId HighLevelILFunction::Nop(const ILSourceLocation& loc)
 }
 
 
-ExprId HighLevelILFunction::Block(const std::vector<ExprId>& exprs, const ILSourceLocation& loc)
+ExprId HighLevelILFunction::Block(const vector<ExprId>& exprs, const ILSourceLocation& loc)
 {
 	return AddExprWithLocation(HLIL_BLOCK, loc, 0, exprs.size(), AddOperandList(exprs));
 }
@@ -2373,7 +2375,7 @@ ExprId HighLevelILFunction::ForSSA(ExprId initExpr, ExprId conditionPhi, ExprId
 }
 
 
-ExprId HighLevelILFunction::Switch(ExprId condition, ExprId defaultExpr, const std::vector<ExprId>& cases,
+ExprId HighLevelILFunction::Switch(ExprId condition, ExprId defaultExpr, const vector<ExprId>& cases,
 	const ILSourceLocation& loc)
 {
 	return AddExprWithLocation(HLIL_SWITCH, loc, 0, condition, defaultExpr,
@@ -2381,7 +2383,7 @@ ExprId HighLevelILFunction::Switch(ExprId condition, ExprId defaultExpr, const s
 }
 
 
-ExprId HighLevelILFunction::Case(const std::vector<ExprId>& values, ExprId expr, const ILSourceLocation& loc)
+ExprId HighLevelILFunction::Case(const vector<ExprId>& values, ExprId expr, const ILSourceLocation& loc)
 {
 	return AddExprWithLocation(HLIL_CASE, loc, 0, values.size(), AddOperandList(values), expr);
 }
-- 
cgit v1.3.1