Skip to content

Commit

Permalink
SINGLE_EVN开启的时候,会有一些冗余变量定义 (Tencent#449)
Browse files Browse the repository at this point in the history
* 消除编译警告;

* 消除编译警告 (SINGLE_ENV开启时);
  • Loading branch information
dotlive authored and chexiongsheng committed Sep 10, 2018
1 parent 907a46f commit 33ff1bd
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions Assets/XLua/Src/ObjectTranslatorPool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@ namespace XLua
{
public class ObjectTranslatorPool
{
private Dictionary<RealStatePtr, WeakReference> translators = new Dictionary<RealStatePtr, WeakReference>();

public static ObjectTranslatorPool Instance
#if !SINGLE_ENV
private Dictionary<RealStatePtr, WeakReference> translators = new Dictionary<RealStatePtr, WeakReference>();
RealStatePtr lastPtr = default(RealStatePtr);
#endif
ObjectTranslator lastTranslator = default(ObjectTranslator);

public static ObjectTranslatorPool Instance
{
get
{
Expand All @@ -50,19 +54,15 @@ public void Add (RealStatePtr L, ObjectTranslator translator)
lock (this)
#endif
{
var ptr = LuaAPI.xlua_gl(L);
lastPtr = ptr;
lastTranslator = translator;

#if !SINGLE_ENV
var ptr = LuaAPI.xlua_gl(L);
lastPtr = ptr;
translators.Add(ptr , new WeakReference(translator));
#endif
#endif
}
}

RealStatePtr lastPtr = default(RealStatePtr);
ObjectTranslator lastTranslator = default(ObjectTranslator);

public ObjectTranslator Find (RealStatePtr L)
{
#if THREAD_SAFE || HOTFIX_ENABLE
Expand Down Expand Up @@ -93,7 +93,6 @@ public void Remove (RealStatePtr L)
#endif
{
#if SINGLE_ENV
lastPtr = default(RealStatePtr);
lastTranslator = default(ObjectTranslator);
#else
var ptr = LuaAPI.xlua_gl(L);
Expand Down

0 comments on commit 33ff1bd

Please sign in to comment.