89 files changed, 3270 insertions, 2729 deletions
diff --git a/spec/outputs/5.1/attrib.lua b/spec/outputs/5.1/attrib.lua
index dc1285c..bda24bc 100644
--- a/spec/outputs/5.1/attrib.lua
+++ b/spec/outputs/5.1/attrib.lua
@@ -5,12 +5,36 @@ do
                        return print("closed")
                end
        })
-        local _close_0 = assert(getmetatable(a).__close)
+        local _close_0
-        local _close_1 = assert(getmetatable(b).__close);
+        if (function()
+                local _val_0 = type(a)
+                return 'table' == _val_0 or 'userdata' == _val_0
+        end)() then
+                _close_0 = assert(getmetatable(a) and getmetatable(a).__close, "variable 'a' got a non-closable value")
+        elseif a == nil then
+                _close_0 = nil
+        else
+                _close_0 = error("variable 'a' got a non-closable value")
+        end
+        local _close_1
+        if (function()
+                local _val_0 = type(b)
+                return 'table' == _val_0 or 'userdata' == _val_0
+        end)() then
+                _close_1 = assert(getmetatable(b) and getmetatable(b).__close, "variable 'b' got a non-closable value")
+        elseif b == nil then
+                _close_1 = nil
+        else
+                _close_1 = error("variable 'b' got a non-closable value")
+        end
        (function(_arg_0, ...)
                local _ok_0 = _arg_0
-                _close_1(b)
+                if _close_1 ~= nil then
-                _close_0(a)
+                        _close_1(b)
+                end
+                if _close_0 ~= nil then
+                        _close_0(a)
+                end
                if _ok_0 then
                        return ...
                else
@@ -53,10 +77,22 @@ do
                        __close = function(self) end
                })
        end
-        local _close_0 = assert(getmetatable(v).__close);
+        local _close_0
+        if (function()
+                local _val_0 = type(v)
+                return 'table' == _val_0 or 'userdata' == _val_0
+        end)() then
+                _close_0 = assert(getmetatable(v) and getmetatable(v).__close, "variable 'v' got a non-closable value")
+        elseif v == nil then
+                _close_0 = nil
+        else
+                _close_0 = error("variable 'v' got a non-closable value")
+        end
        (function(_arg_0, ...)
                local _ok_0 = _arg_0
-                _close_0(v)
+                if _close_0 ~= nil then
+                        _close_0(v)
+                end
                if _ok_0 then
                        return ...
                else
@@ -69,10 +105,22 @@ do
                        _with_0:write("Hello")
                        f = _with_0
                end
-                local _close_1 = assert(getmetatable(f).__close)
+                local _close_1
+                if (function()
+                        local _val_0 = type(f)
+                        return 'table' == _val_0 or 'userdata' == _val_0
+                end)() then
+                        _close_1 = assert(getmetatable(f) and getmetatable(f).__close, "variable 'f' got a non-closable value")
+                elseif f == nil then
+                        _close_1 = nil
+                else
+                        _close_1 = error("variable 'f' got a non-closable value")
+                end
                return (function(_arg_0, ...)
                        local _ok_0 = _arg_0
-                        _close_1(f)
+                        if _close_1 ~= nil then
+                                _close_1(f)
+                        end
                        if _ok_0 then
                                return ...
                        else
@@ -88,14 +136,28 @@ do
        end
        local b
        if not false then
-                if x then
+                b = ((function()
-                        b = 1
+                        if x then
-                end
+                                return 1
+                        end
+                end)())
+        end
+        local _close_0
+        if (function()
+                local _val_0 = type(b)
+                return 'table' == _val_0 or 'userdata' == _val_0
+        end)() then
+                _close_0 = assert(getmetatable(b) and getmetatable(b).__close, "variable 'b' got a non-closable value")
+        elseif b == nil then
+                _close_0 = nil
+        else
+                _close_0 = error("variable 'b' got a non-closable value")
        end
-        local _close_0 = assert(getmetatable(b).__close);
        (function(_arg_0, ...)
                local _ok_0 = _arg_0
-                _close_0(b)
+                if _close_0 ~= nil then
+                        _close_0(b)
+                end
                if _ok_0 then
                        return ...
                else
@@ -104,10 +166,12 @@ do
        end)(pcall(function()
                local c
                if true then
-                        local _exp_0 = x
+                        c = ((function()
-                        if "abc" == _exp_0 then
+                                local _exp_0 = x
-                                c = 998
+                                if "abc" == _exp_0 then
-                        end
+                                        return 998
+                                end
+                        end)())
                end
                local d
                if (function()
@@ -121,10 +185,22 @@ do
                                value = value
                        }
                end
-                local _close_1 = assert(getmetatable(d).__close)
+                local _close_1
+                if (function()
+                        local _val_0 = type(d)
+                        return 'table' == _val_0 or 'userdata' == _val_0
+                end)() then
+                        _close_1 = assert(getmetatable(d) and getmetatable(d).__close, "variable 'd' got a non-closable value")
+                elseif d == nil then
+                        _close_1 = nil
+                else
+                        _close_1 = error("variable 'd' got a non-closable value")
+                end
                return (function(_arg_0, ...)
                        local _ok_0 = _arg_0
-                        _close_1(d)
+                        if _close_1 ~= nil then
+                                _close_1(d)
+                        end
                        if _ok_0 then
                                return ...
                        else
@@ -140,10 +216,22 @@ do
                _with_0:write("Hello")
                _ = _with_0
        end
-        local _close_0 = assert(getmetatable(_).__close);
+        local _close_0
+        if (function()
+                local _val_0 = type(_)
+                return 'table' == _val_0 or 'userdata' == _val_0
+        end)() then
+                _close_0 = assert(getmetatable(_) and getmetatable(_).__close, "variable '_' got a non-closable value")
+        elseif _ == nil then
+                _close_0 = nil
+        else
+                _close_0 = error("variable '_' got a non-closable value")
+        end
        (function(_arg_0, ...)
                local _ok_0 = _arg_0
-                _close_0(_)
+                if _close_0 ~= nil then
+                        _close_0(_)
+                end
                if _ok_0 then
                        return ...
                else
@@ -155,10 +243,22 @@ do
                                return print("second")
                        end
                })
-                local _close_1 = assert(getmetatable(_).__close)
+                local _close_1
+                if (function()
+                        local _val_0 = type(_)
+                        return 'table' == _val_0 or 'userdata' == _val_0
+                end)() then
+                        _close_1 = assert(getmetatable(_) and getmetatable(_).__close, "variable '_' got a non-closable value")
+                elseif _ == nil then
+                        _close_1 = nil
+                else
+                        _close_1 = error("variable '_' got a non-closable value")
+                end
                return (function(_arg_0, ...)
                        local _ok_0 = _arg_0
-                        _close_1(_)
+                        if _close_1 ~= nil then
+                                _close_1(_)
+                        end
                        if _ok_0 then
                                return ...
                        else
@@ -170,10 +270,22 @@ do
                                        return print("first")
                                end
                        })
-                        local _close_2 = assert(getmetatable(_).__close)
+                        local _close_2
+                        if (function()
+                                local _val_0 = type(_)
+                                return 'table' == _val_0 or 'userdata' == _val_0
+                        end)() then
+                                _close_2 = assert(getmetatable(_) and getmetatable(_).__close, "variable '_' got a non-closable value")
+                        elseif _ == nil then
+                                _close_2 = nil
+                        else
+                                _close_2 = error("variable '_' got a non-closable value")
+                        end
                        return (function(_arg_0, ...)
                                local _ok_0 = _arg_0
-                                _close_2(_)
+                                if _close_2 ~= nil then
+                                        _close_2(_)
+                                end
                                if _ok_0 then
                                        return ...
                                else
@@ -200,10 +312,22 @@ do
        local _ = def(function()
                return print(3)
        end)
-        local _close_0 = assert(getmetatable(_).__close)
+        local _close_0
+        if (function()
+                local _val_0 = type(_)
+                return 'table' == _val_0 or 'userdata' == _val_0
+        end)() then
+                _close_0 = assert(getmetatable(_) and getmetatable(_).__close, "variable '_' got a non-closable value")
+        elseif _ == nil then
+                _close_0 = nil
+        else
+                _close_0 = error("variable '_' got a non-closable value")
+        end
        return (function(_arg_0, ...)
                local _ok_0 = _arg_0
-                _close_0(_)
+                if _close_0 ~= nil then
+                        _close_0(_)
+                end
                if _ok_0 then
                        return ...
                else
@@ -213,10 +337,22 @@ do
                local _ = def(function()
                        return print(2)
                end)
-                local _close_1 = assert(getmetatable(_).__close)
+                local _close_1
+                if (function()
+                        local _val_0 = type(_)
+                        return 'table' == _val_0 or 'userdata' == _val_0
+                end)() then
+                        _close_1 = assert(getmetatable(_) and getmetatable(_).__close, "variable '_' got a non-closable value")
+                elseif _ == nil then
+                        _close_1 = nil
+                else
+                        _close_1 = error("variable '_' got a non-closable value")
+                end
                return (function(_arg_0, ...)
                        local _ok_0 = _arg_0
-                        _close_1(_)
+                        if _close_1 ~= nil then
+                                _close_1(_)
+                        end
                        if _ok_0 then
                                return ...
                        else
@@ -226,10 +362,22 @@ do
                        local _ = def(function()
                                return print(1)
                        end)
-                        local _close_2 = assert(getmetatable(_).__close)
+                        local _close_2
+                        if (function()
+                                local _val_0 = type(_)
+                                return 'table' == _val_0 or 'userdata' == _val_0
+                        end)() then
+                                _close_2 = assert(getmetatable(_) and getmetatable(_).__close, "variable '_' got a non-closable value")
+                        elseif _ == nil then
+                                _close_2 = nil
+                        else
+                                _close_2 = error("variable '_' got a non-closable value")
+                        end
                        return (function(_arg_0, ...)
                                local _ok_0 = _arg_0
-                                _close_2(_)
+                                if _close_2 ~= nil then
+                                        _close_2(_)
+                                end
                                if _ok_0 then
                                        return ...
                                else
diff --git a/spec/outputs/5.1/try_catch.lua b/spec/outputs/5.1/try_catch.lua
index d4c80c1..efd92c6 100644
--- a/spec/outputs/5.1/try_catch.lua
+++ b/spec/outputs/5.1/try_catch.lua
@@ -8,10 +8,10 @@ local _anon_func_2 = function(tb)
        return tb.func()
 end
 local _anon_func_3 = function(tb)
-        return tb.func()
+        return (tb.func())
 end
 local _anon_func_4 = function(tb)
-        return tb:func(1, 2, 3)
+        return (tb:func(1, 2, 3))
 end
 local _anon_func_5 = function(tb)
        return tb.func(1)
@@ -64,7 +64,7 @@ f = function()
                print("OK")
        end
        if xpcall(function()
-                return func(1)
+                return (func(1))
        end, function(err)
                return print(err)
        end) then
diff --git a/spec/outputs/assign.lua b/spec/outputs/assign.lua
index f889865..162c5a8 100644
--- a/spec/outputs/assign.lua
+++ b/spec/outputs/assign.lua
@@ -36,10 +36,10 @@ local x
 do
        local f = getHandler()
        if f then
-                do
+                x = ((function()
                        f()
-                        x = 123
+                        return 123
-                end
+                end)())
        end
 end
 local _anon_func_0 = function(print)
diff --git a/spec/outputs/attrib.lua b/spec/outputs/attrib.lua
index e48963c..bb9916c 100644
--- a/spec/outputs/attrib.lua
+++ b/spec/outputs/attrib.lua
@@ -56,17 +56,21 @@ do
        end
        local b
        if not false then
-                if x then
+                b = ((function()
-                        b = 1
+                        if x then
-                end
+                                return 1
+                        end
+                end)())
        end
        local _close_0 <close> = b
        local c
        if true then
-                local _exp_0 = x
+                c = ((function()
-                if "abc" == _exp_0 then
+                        local _exp_0 = x
-                        c = 998
+                        if "abc" == _exp_0 then
-                end
+                                return 998
+                        end
+                end)())
        end
        local d
        if (function()
diff --git a/spec/outputs/do.lua b/spec/outputs/do.lua
index 6473e03..96d1022 100644
--- a/spec/outputs/do.lua
+++ b/spec/outputs/do.lua
@@ -32,10 +32,10 @@ local t = {
 }
 return function(y, k)
        if y == nil then
-                do
+                y = ((function()
                        x = 10 + 2
-                        y = x
+                        return x
-                end
+                end)())
        end
        if k == nil then
                do
diff --git a/spec/outputs/syntax.lua b/spec/outputs/syntax.lua
index 5fd1821..040a325 100644
--- a/spec/outputs/syntax.lua
+++ b/spec/outputs/syntax.lua
@@ -239,9 +239,11 @@ x = 0
 local _list_0 = values
 for _index_0 = 1, #_list_0 do
        local v = _list_0[_index_0]
-        if ntype(v) == "fndef" then
+        _ = ((function()
-                _ = x + 1
+                if ntype(v) == "fndef" then
-        end
+                        return x + 1
+                end
+        end)())
 end
 hello = {
        something = world,
diff --git a/spec/outputs/try_catch.lua b/spec/outputs/try_catch.lua
index d4c80c1..efd92c6 100644
--- a/spec/outputs/try_catch.lua
+++ b/spec/outputs/try_catch.lua
@@ -8,10 +8,10 @@ local _anon_func_2 = function(tb)
        return tb.func()
 end
 local _anon_func_3 = function(tb)
-        return tb.func()
+        return (tb.func())
 end
 local _anon_func_4 = function(tb)
-        return tb:func(1, 2, 3)
+        return (tb:func(1, 2, 3))
 end
 local _anon_func_5 = function(tb)
        return tb.func(1)
@@ -64,7 +64,7 @@ f = function()
                print("OK")
        end
        if xpcall(function()
-                return func(1)
+                return (func(1))
        end, function(err)
                return print(err)
        end) then
diff --git a/spec/outputs/unicode/assign.lua b/spec/outputs/unicode/assign.lua
index bf43953..d4ad56a 100644
--- a/spec/outputs/unicode/assign.lua
+++ b/spec/outputs/unicode/assign.lua
@@ -36,10 +36,10 @@ local _u53d8_u91cfx
 do
        local _u51fd_u6570 = _u83b7_u53d6_u5904_u7406_u51fd_u6570()
        if _u51fd_u6570 then
-                do
+                _u53d8_u91cfx = ((function()
                        _u51fd_u6570()
-                        _u53d8_u91cfx = 123
+                        return 123
-                end
+                end)())
        end
 end
 local _anon_func_0 = function(_u6253_u5370)
diff --git a/spec/outputs/unicode/attrib.lua b/spec/outputs/unicode/attrib.lua
index 1c48de4..5e5bb99 100644
--- a/spec/outputs/unicode/attrib.lua
+++ b/spec/outputs/unicode/attrib.lua
@@ -48,17 +48,21 @@ do
        end
        local _u5173_u95ed_u53d8_u91cfb
        if not false then
-                if _u6761_u4ef6x then
+                _u5173_u95ed_u53d8_u91cfb = ((function()
-                        _u5173_u95ed_u53d8_u91cfb = 1
+                        if _u6761_u4ef6x then
-                end
+                                return 1
+                        end
+                end)())
        end
        local _close_0 <close> = _u5173_u95ed_u53d8_u91cfb
        local _u5e38_u91cfc
        if true then
-                local _exp_0 = _u6761_u4ef6x
+                _u5e38_u91cfc = ((function()
-                if "abc" == _exp_0 then
+                        local _exp_0 = _u6761_u4ef6x
-                        _u5e38_u91cfc = 998
+                        if "abc" == _exp_0 then
-                end
+                                return 998
+                        end
+                end)())
        end
        local _u5173_u95ed_u53d8_u91cfd
        if (function()
diff --git a/spec/outputs/unicode/do.lua b/spec/outputs/unicode/do.lua
index f9c3079..7bf1da3 100644
--- a/spec/outputs/unicode/do.lua
+++ b/spec/outputs/unicode/do.lua
@@ -32,10 +32,10 @@ local _u53d8_u91cft = {
 }
 return function(_u53c2_u6570y, _u53c2_u6570k)
        if _u53c2_u6570y == nil then
-                do
+                _u53c2_u6570y = ((function()
                        _u53d8_u91cfx = 10 + 2
-                        _u53c2_u6570y = _u53d8_u91cfx
+                        return _u53d8_u91cfx
-                end
+                end)())
        end
        if _u53c2_u6570k == nil then
                do
diff --git a/spec/outputs/unicode/macro.lua b/spec/outputs/unicode/macro.lua
index 099080f..b14f571 100644
--- a/spec/outputs/unicode/macro.lua
+++ b/spec/outputs/unicode/macro.lua
@@ -215,52 +215,85 @@ do
 -- 这有个注释
 end
 local _ = require('下划线')
-local _call_0 = (_({
+local _anon_func_0 = function(_)
-        1,
+        do
-        2,
+                local _call_0 = (_({
-        3,
+                        1,
-        4,
+                        2,
-        -2,
+                        3,
-        3
+                        4,
-}))
+                        -2,
-_call_0 = _call_0["链"](_call_0)
+                        3
-_call_0 = _call_0["映射"](_call_0, function(self)
+                }))
-        return self * 2
+                return _call_0["链"](_call_0)
-end)
+        end
-_call_0 = _call_0["过滤"](_call_0, function(self)
+end
-        return self > 3
+local _call_0 = ((function()
-end)
+        local _call_0 = ((function()
-local _u7ed3_u679ca = _call_0["取值"](_call_0)
+                local _call_0 = (_anon_func_0(_))
-do
+                return _call_0["映射"](_call_0, function(self)
-        local _call_1 = (_({
+                        return self * 2
-                1,
+                end)
-                2,
+        end)())
-                3,
+        return _call_0["过滤"](_call_0, function(self)
-                4,
-                -2,
-                3
-        }))
-        _call_1 = _call_1["链"](_call_1)
-        _call_1 = _call_1["映射"](_call_1, function(self)
-                return self * 2
-        end)
-        _call_1 = _call_1["过滤"](_call_1, function(self)
                return self > 3
        end)
+end)())
+local _u7ed3_u679ca = _call_0["取值"](_call_0)
+local _anon_func_1 = function(_)
+        do
+                local _call_1 = (_({
+                        1,
+                        2,
+                        3,
+                        4,
+                        -2,
+                        3
+                }))
+                return _call_1["链"](_call_1)
+        end
+end
+do
+        local _call_1 = ((function()
+                local _call_1 = ((function()
+                        local _call_1 = (_anon_func_1(_))
+                        return _call_1["映射"](_call_1, function(self)
+                                return self * 2
+                        end)
+                end)())
+                return _call_1["过滤"](_call_1, function(self)
+                        return self > 3
+                end)
+        end)())
        _call_1["每一个"](_call_1, function(self)
                return _u6253_u5370(self)
        end)
 end
-local _call_1 = _u539f_u70b9["变换"]["根节点"]["游戏对象"]
+local _anon_func_2 = function(_u539f_u70b9)
-_call_1 = _call_1["父节点"](_call_1)
+        do
-_call_1 = _call_1["后代"](_call_1)
+                local _call_1 = _u539f_u70b9["变换"]["根节点"]["游戏对象"]
-_call_1 = _call_1["选择启用"](_call_1)
+                return _call_1["父节点"](_call_1)
-_call_1 = _call_1["选择可见"](_call_1)
+        end
-_call_1 = _call_1["标签等于"](_call_1, "fx")
+end
-_call_1 = _call_1["其中"](_call_1, function(x)
+local _call_1 = ((function()
-        local _call_2 = x["名称"]
+        local _call_1 = ((function()
-        return _call_2["结尾为"](_call_2, "(克隆)")
+                local _call_1 = ((function()
-end)
+                        local _call_1 = ((function()
+                                local _call_1 = ((function()
+                                        local _call_1 = (_anon_func_2(_u539f_u70b9))
+                                        return _call_1["后代"](_call_1)
+                                end)())
+                                return _call_1["选择启用"](_call_1)
+                        end)())
+                        return _call_1["选择可见"](_call_1)
+                end)())
+                return _call_1["标签等于"](_call_1, "fx")
+        end)())
+        return _call_1["其中"](_call_1, function(x)
+                local _call_2 = x["名称"]
+                return _call_2["结尾为"](_call_2, "(克隆)")
+        end)
+end)())
 _u7ed3_u679c = _call_1["摧毁"](_call_1)
 do
        do
diff --git a/spec/outputs/unicode/syntax.lua b/spec/outputs/unicode/syntax.lua
index ea97bb9..1984f40 100644
--- a/spec/outputs/unicode/syntax.lua
+++ b/spec/outputs/unicode/syntax.lua
@@ -258,9 +258,11 @@ _u53d8_u91cfx = 0
 local _list_0 = _u503c
 for _index_0 = 1, #_list_0 do
        local _u53d8_u91cfv = _list_0[_index_0]
-        if ntype(_u53d8_u91cfv) == "函数定义" then
+        _ = ((function()
-                _ = _u53d8_u91cfx + 1
+                if ntype(_u53d8_u91cfv) == "函数定义" then
-        end
+                        return _u53d8_u91cfx + 1
+                end
+        end)())
 end
 _u4f60_u597d = {
        ["某物"] = _u4e16_u754c,
diff --git a/spec/outputs/unicode/try_catch.lua b/spec/outputs/unicode/try_catch.lua
index 22f29f9..f8c7849 100644
--- a/spec/outputs/unicode/try_catch.lua
+++ b/spec/outputs/unicode/try_catch.lua
@@ -32,11 +32,13 @@ pcall(function()
        return _u8868["函数"]()
 end)
 pcall(function()
-        return _u8868["函数"]()
+        return (_u8868["函数"]())
 end)
 pcall(function()
-        local _call_0 = _u8868
+        return ((function()
-        return _call_0["函数"](_call_0, 1, 2, 3)
+                local _call_0 = _u8868
+                return _call_0["函数"](_call_0, 1, 2, 3)
+        end)())
 end)
 pcall(function()
        return _u8868["函数"](1)
@@ -52,7 +54,7 @@ end)) then
        _u6253_u5370("好的")
 end
 if xpcall(function()
-        return _u51fd_u6570(1)
+        return (_u51fd_u6570(1))
 end, function(_u9519_u8bef)
        return _u6253_u5370(_u9519_u8bef)
 end) then
diff --git a/src/3rdParty/efsw/Atomic.hpp b/src/3rdParty/efsw/Atomic.hpp
index 4008dfc..9015c60 100755..100644
--- a/src/3rdParty/efsw/Atomic.hpp
+++ b/src/3rdParty/efsw/Atomic.hpp
@@ -3,9 +3,7 @@
 #include <efsw/base.hpp>
-#ifdef EFSW_USE_CXX11
 #include <atomic>
-#endif
 namespace efsw {
@@ -14,36 +12,20 @@ template <typename T> class Atomic {
        explicit Atomic( T set = false ) : set_( set ) {}
        Atomic& operator=( T set ) {
-#ifdef EFSW_USE_CXX11
                set_.store( set, std::memory_order_release );
-#else
-                set_ = set;
-#endif
                return *this;
        }
        explicit operator T() const {
-#ifdef EFSW_USE_CXX11
                return set_.load( std::memory_order_acquire );
-#else
-                return set_;
-#endif
        }
        T load() const {
-#ifdef EFSW_USE_CXX11
                return set_.load( std::memory_order_acquire );
-#else
-                return set_;
-#endif
        }
  private:
-#ifdef EFSW_USE_CXX11
        std::atomic<T> set_;
-#else
-        volatile T set_;
-#endif
 };
 } // namespace efsw
diff --git a/src/3rdParty/efsw/Debug.cpp b/src/3rdParty/efsw/Debug.cpp
index 18cfd31..18cfd31 100755..100644
--- a/src/3rdParty/efsw/Debug.cpp
+++ b/src/3rdParty/efsw/Debug.cpp
diff --git a/src/3rdParty/efsw/Debug.hpp b/src/3rdParty/efsw/Debug.hpp
index 78d3557..fefaec4 100755..100644
--- a/src/3rdParty/efsw/Debug.hpp
+++ b/src/3rdParty/efsw/Debug.hpp
@@ -49,8 +49,10 @@ void efPRINTC( unsigned int cond, const char* format, ... );
 #define efDEBUGC( cond, format, args... ) \
        {}
 #else
-#define efDEBUG
+#define efDEBUG( ... ) \
-#define efDEBUGC
+        {}
+#define efDEBUGC( ... ) \
+        {}
 #endif
 #endif
diff --git a/src/3rdParty/efsw/DirWatcherGeneric.cpp b/src/3rdParty/efsw/DirWatcherGeneric.cpp
index 8b6bc8a..8b6bc8a 100755..100644
--- a/src/3rdParty/efsw/DirWatcherGeneric.cpp
+++ b/src/3rdParty/efsw/DirWatcherGeneric.cpp
diff --git a/src/3rdParty/efsw/DirWatcherGeneric.hpp b/src/3rdParty/efsw/DirWatcherGeneric.hpp
index ca52de7..ca52de7 100755..100644
--- a/src/3rdParty/efsw/DirWatcherGeneric.hpp
+++ b/src/3rdParty/efsw/DirWatcherGeneric.hpp
diff --git a/src/3rdParty/efsw/DirectorySnapshot.cpp b/src/3rdParty/efsw/DirectorySnapshot.cpp
index 6049e4a..f78475f 100755..100644
--- a/src/3rdParty/efsw/DirectorySnapshot.cpp
+++ b/src/3rdParty/efsw/DirectorySnapshot.cpp
@@ -44,7 +44,7 @@ void DirectorySnapshot::initFiles() {
        Files = FileSystem::filesInfoFromPath( DirectoryInfo.Filepath );
        FileInfoMap::iterator it = Files.begin();
-        std::list<std::string> eraseFiles;
+        std::vector<std::string> eraseFiles;
        /// Remove all non regular files and non directories
        for ( ; it != Files.end(); it++ ) {
@@ -53,7 +53,7 @@ void DirectorySnapshot::initFiles() {
                }
        }
-        for ( std::list<std::string>::iterator eit = eraseFiles.begin(); eit != eraseFiles.end();
+        for ( std::vector<std::string>::iterator eit = eraseFiles.begin(); eit != eraseFiles.end();
                  eit++ ) {
                Files.erase( *eit );
        }
diff --git a/src/3rdParty/efsw/DirectorySnapshot.hpp b/src/3rdParty/efsw/DirectorySnapshot.hpp
index 0e60542..0e60542 100755..100644
--- a/src/3rdParty/efsw/DirectorySnapshot.hpp
+++ b/src/3rdParty/efsw/DirectorySnapshot.hpp
diff --git a/src/3rdParty/efsw/DirectorySnapshotDiff.cpp b/src/3rdParty/efsw/DirectorySnapshotDiff.cpp
index 37ee507..37ee507 100755..100644
--- a/src/3rdParty/efsw/DirectorySnapshotDiff.cpp
+++ b/src/3rdParty/efsw/DirectorySnapshotDiff.cpp
diff --git a/src/3rdParty/efsw/DirectorySnapshotDiff.hpp b/src/3rdParty/efsw/DirectorySnapshotDiff.hpp
index 26a29ec..26a29ec 100755..100644
--- a/src/3rdParty/efsw/DirectorySnapshotDiff.hpp
+++ b/src/3rdParty/efsw/DirectorySnapshotDiff.hpp
diff --git a/src/3rdParty/efsw/FileInfo.cpp b/src/3rdParty/efsw/FileInfo.cpp
index 072cd6d..707f617 100755..100644
--- a/src/3rdParty/efsw/FileInfo.cpp
+++ b/src/3rdParty/efsw/FileInfo.cpp
@@ -35,10 +35,6 @@
 #endif
 #endif
-#if EFSW_PLATFORM != EFSW_PLATFORM_WIN32
-#include <filesystem>
-#endif
 namespace efsw {
 bool FileInfo::exists( const std::string& filePath ) {
@@ -186,12 +182,14 @@ bool FileInfo::isLink() const {
 std::string FileInfo::linksTo() {
 #if EFSW_PLATFORM != EFSW_PLATFORM_WIN32
        if ( isLink() ) {
-                std::error_code ec;
+                char* ch = realpath( Filepath.c_str(), NULL );
-                auto ch = std::filesystem::canonical( Filepath, ec );
+                if ( NULL != ch ) {
+                        std::string tstr( ch );
-                if ( !ec ) {
+                        free( ch );
-                        return ch.string();
+                        return tstr;
                }
        }
 #endif
diff --git a/src/3rdParty/efsw/FileInfo.hpp b/src/3rdParty/efsw/FileInfo.hpp
index f1bcf4b..1b55c35 100755..100644
--- a/src/3rdParty/efsw/FileInfo.hpp
+++ b/src/3rdParty/efsw/FileInfo.hpp
@@ -2,7 +2,7 @@
 #define EFSW_FILEINFO_HPP
 #include <efsw/base.hpp>
-#include <list>
+#include <vector>
 #include <map>
 #include <string>
@@ -18,11 +18,11 @@ class FileInfo {
        FileInfo();
-        explicit FileInfo( const std::string& filepath );
+        FileInfo( const std::string& filepath );
        FileInfo( const std::string& filepath, bool linkInfo );
-        FileInfo( const FileInfo& ) = default;
+        FileInfo(const FileInfo&) = default;
        bool operator==( const FileInfo& Other ) const;
@@ -58,8 +58,8 @@ class FileInfo {
 };
 typedef std::map<std::string, FileInfo> FileInfoMap;
-typedef std::list<FileInfo> FileInfoList;
+typedef std::vector<FileInfo> FileInfoList;
-typedef std::list<std::pair<std::string, FileInfo>> MovedList;
+typedef std::vector<std::pair<std::string, FileInfo>> MovedList;
 } // namespace efsw
diff --git a/src/3rdParty/efsw/FileSystem.cpp b/src/3rdParty/efsw/FileSystem.cpp
index 867f120..1ed346c 100755..100644
--- a/src/3rdParty/efsw/FileSystem.cpp
+++ b/src/3rdParty/efsw/FileSystem.cpp
@@ -1,10 +1,19 @@
+#include <cstring>
 #include <efsw/FileSystem.hpp>
 #include <efsw/platform/platformimpl.hpp>
+#include <climits>
 #if EFSW_OS == EFSW_OS_MACOSX
 #include <CoreFoundation/CoreFoundation.h>
 #endif
+#if EFSW_OS == EFSW_OS_WIN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#endif
 namespace efsw {
 bool FileSystem::isDirectory( const std::string& path ) {
@@ -26,13 +35,13 @@ bool FileSystem::slashAtEnd( std::string& dir ) {
 }
 void FileSystem::dirAddSlashAtEnd( std::string& dir ) {
-        if ( dir.size() > 1 && dir[dir.size() - 1] != getOSSlash() ) {
+        if ( dir.size() >= 1 && dir[dir.size() - 1] != getOSSlash() ) {
                dir.push_back( getOSSlash() );
        }
 }
 void FileSystem::dirRemoveSlashAtEnd( std::string& dir ) {
-        if ( dir.size() > 1 && dir[dir.size() - 1] == getOSSlash() ) {
+        if ( dir.size() >= 1 && dir[dir.size() - 1] == getOSSlash() ) {
                dir.erase( dir.size() - 1 );
        }
 }
@@ -91,13 +100,30 @@ std::string FileSystem::precomposeFileName( const std::string& name ) {
        CFStringNormalize( cfMutable, kCFStringNormalizationFormC );
-        char c_str[255 + 1];
+        const char* c_str = CFStringGetCStringPtr( cfMutable, kCFStringEncodingUTF8 );
-        CFStringGetCString( cfMutable, c_str, sizeof( c_str ) - 1, kCFStringEncodingUTF8 );
+        if ( c_str != NULL ) {
+                std::string result( c_str );
-        CFRelease( cfStringRef );
+                CFRelease( cfStringRef );
-        CFRelease( cfMutable );
+                CFRelease( cfMutable );
+                return result;
+        }
+        CFIndex length = CFStringGetLength( cfMutable );
+        CFIndex maxSize = CFStringGetMaximumSizeForEncoding( length, kCFStringEncodingUTF8 );
+        if ( maxSize == kCFNotFound ) {
+                CFRelease( cfStringRef );
+                CFRelease( cfMutable );
+                return std::string();
+        }
-        return std::string( c_str );
+        std::string result( maxSize + 1, '\0' );
+        if ( CFStringGetCString( cfMutable, &result[0], result.size(), kCFStringEncodingUTF8 ) ) {
+                result.resize( std::strlen( result.c_str() ) );
+                CFRelease( cfStringRef );
+                CFRelease( cfMutable );
+        } else {
+                result.clear();
+        }
+        return result;
 #else
        return name;
 #endif
@@ -115,4 +141,21 @@ std::string FileSystem::getCurrentWorkingDirectory() {
        return Platform::FileSystem::getCurrentWorkingDirectory();
 }
+std::string FileSystem::getRealPath( const std::string& path ) {
+        std::string realPath;
+#if defined( EFSW_PLATFORM_POSIX )
+        char dir[PATH_MAX];
+        realpath( path.c_str(), &dir[0] );
+        realPath = std::string( dir );
+#elif EFSW_OS == EFSW_OS_WIN
+        wchar_t dir[_MAX_PATH + 1];
+        GetFullPathNameW( String::fromUtf8( path ).toWideString().c_str(), _MAX_PATH, &dir[0],
+                                          nullptr );
+        realPath = String( dir ).toUtf8();
+#else
+#warning FileSystem::getRealPath() not implemented on this platform.
+#endif
+        return realPath;
+}
 } // namespace efsw
diff --git a/src/3rdParty/efsw/FileSystem.hpp b/src/3rdParty/efsw/FileSystem.hpp
index 6c24386..1d66ece 100755..100644
--- a/src/3rdParty/efsw/FileSystem.hpp
+++ b/src/3rdParty/efsw/FileSystem.hpp
@@ -3,7 +3,6 @@
 #include <efsw/FileInfo.hpp>
 #include <efsw/base.hpp>
-#include <map>
 namespace efsw {
@@ -34,6 +33,9 @@ class FileSystem {
        static bool changeWorkingDirectory( const std::string& path );
        static std::string getCurrentWorkingDirectory();
+        static std::string getRealPath( const std::string& path );
 };
 } // namespace efsw
diff --git a/src/3rdParty/efsw/FileWatcher.cpp b/src/3rdParty/efsw/FileWatcher.cpp
index 696a46f..f45b243 100755..100644
--- a/src/3rdParty/efsw/FileWatcher.cpp
+++ b/src/3rdParty/efsw/FileWatcher.cpp
@@ -1,119 +1,120 @@
-#include <efsw/FileSystem.hpp>
+#include <efsw/FileSystem.hpp>
-#include <efsw/FileWatcherGeneric.hpp>
+#include <efsw/FileWatcherGeneric.hpp>
-#include <efsw/FileWatcherImpl.hpp>
+#include <efsw/FileWatcherImpl.hpp>
-#include <efsw/efsw.hpp>
+#include <efsw/efsw.hpp>
-#if EFSW_PLATFORM == EFSW_PLATFORM_WIN32
+#if EFSW_PLATFORM == EFSW_PLATFORM_WIN32
-#include <efsw/FileWatcherWin32.hpp>
+#include <efsw/FileWatcherWin32.hpp>
-#define FILEWATCHER_IMPL FileWatcherWin32
+#define FILEWATCHER_IMPL FileWatcherWin32
-#define BACKEND_NAME "Win32"
+#define BACKEND_NAME "Win32"
-#elif EFSW_PLATFORM == EFSW_PLATFORM_INOTIFY
+#elif EFSW_PLATFORM == EFSW_PLATFORM_INOTIFY
-#include <efsw/FileWatcherInotify.hpp>
+#include <efsw/FileWatcherInotify.hpp>
-#define FILEWATCHER_IMPL FileWatcherInotify
+#define FILEWATCHER_IMPL FileWatcherInotify
-#define BACKEND_NAME "Inotify"
+#define BACKEND_NAME "Inotify"
-#elif EFSW_PLATFORM == EFSW_PLATFORM_KQUEUE
+#elif EFSW_PLATFORM == EFSW_PLATFORM_KQUEUE
-#include <efsw/FileWatcherKqueue.hpp>
+#include <efsw/FileWatcherKqueue.hpp>
-#define FILEWATCHER_IMPL FileWatcherKqueue
+#define FILEWATCHER_IMPL FileWatcherKqueue
-#define BACKEND_NAME "Kqueue"
+#define BACKEND_NAME "Kqueue"
-#elif EFSW_PLATFORM == EFSW_PLATFORM_FSEVENTS
+#elif EFSW_PLATFORM == EFSW_PLATFORM_FSEVENTS
-#include <efsw/FileWatcherFSEvents.hpp>
+#include <efsw/FileWatcherFSEvents.hpp>
-#define FILEWATCHER_IMPL FileWatcherFSEvents
+#define FILEWATCHER_IMPL FileWatcherFSEvents
-#define BACKEND_NAME "FSEvents"
+#define BACKEND_NAME "FSEvents"
-#else
+#else
-#define FILEWATCHER_IMPL FileWatcherGeneric
+#define FILEWATCHER_IMPL FileWatcherGeneric
-#define BACKEND_NAME "Generic"
+#define BACKEND_NAME "Generic"
-#endif
+#endif
-#include <efsw/Debug.hpp>
+#include <efsw/Debug.hpp>
-namespace efsw {
+namespace efsw {
-FileWatcher::FileWatcher() : mFollowSymlinks( false ), mOutOfScopeLinks( false ) {
+FileWatcher::FileWatcher() : mFollowSymlinks( false ), mOutOfScopeLinks( false ) {
-        efDEBUG( "Using backend: %s\n", BACKEND_NAME );
+        efDEBUG( "Using backend: %s\n", BACKEND_NAME );
-        mImpl = new FILEWATCHER_IMPL( this );
+        mImpl = new FILEWATCHER_IMPL( this );
-        if ( !mImpl->initOK() ) {
+        if ( !mImpl->initOK() ) {
-                efSAFE_DELETE( mImpl );
+                efSAFE_DELETE( mImpl );
-                efDEBUG( "Falled back to backend: %s\n", BACKEND_NAME );
+                efDEBUG( "Falled back to backend: %s\n", BACKEND_NAME );
-                mImpl = new FileWatcherGeneric( this );
+                mImpl = new FileWatcherGeneric( this );
-        }
+        }
-}
+}
-FileWatcher::FileWatcher( bool useGenericFileWatcher ) :
+FileWatcher::FileWatcher( bool useGenericFileWatcher ) :
-        mFollowSymlinks( false ), mOutOfScopeLinks( false ) {
+        mFollowSymlinks( false ), mOutOfScopeLinks( false ) {
-        if ( useGenericFileWatcher ) {
+        if ( useGenericFileWatcher ) {
-                efDEBUG( "Using backend: Generic\n" );
+                efDEBUG( "Using backend: Generic\n" );
-                mImpl = new FileWatcherGeneric( this );
+                mImpl = new FileWatcherGeneric( this );
-        } else {
+        } else {
-                efDEBUG( "Using backend: %s\n", BACKEND_NAME );
+                efDEBUG( "Using backend: %s\n", BACKEND_NAME );
-                mImpl = new FILEWATCHER_IMPL( this );
+                mImpl = new FILEWATCHER_IMPL( this );
-                if ( !mImpl->initOK() ) {
+                if ( !mImpl->initOK() ) {
-                        efSAFE_DELETE( mImpl );
+                        efSAFE_DELETE( mImpl );
-                        efDEBUG( "Falled back to backend: %s\n", BACKEND_NAME );
+                        efDEBUG( "Falled back to backend: %s\n", BACKEND_NAME );
-                        mImpl = new FileWatcherGeneric( this );
+                        mImpl = new FileWatcherGeneric( this );
-                }
+                }
-        }
+        }
-}
+}
-FileWatcher::~FileWatcher() {
+FileWatcher::~FileWatcher() {
-        efSAFE_DELETE( mImpl );
+        efSAFE_DELETE( mImpl );
-}
+}
-WatchID FileWatcher::addWatch( const std::string& directory, FileWatchListener* watcher ) {
+WatchID FileWatcher::addWatch( const std::string& directory, FileWatchListener* watcher ) {
-        if ( mImpl->mIsGeneric || !FileSystem::isRemoteFS( directory ) ) {
+        return addWatch( directory, watcher, false, {} );
-                return mImpl->addWatch( directory, watcher, false );
+}
-        } else {
-                return Errors::Log::createLastError( Errors::FileRemote, directory );
+WatchID FileWatcher::addWatch( const std::string& directory, FileWatchListener* watcher,
-        }
+                                                           bool recursive ) {
-}
+        return addWatch( directory, watcher, recursive, {} );
+}
-WatchID FileWatcher::addWatch( const std::string& directory, FileWatchListener* watcher,
-                                                           bool recursive ) {
+WatchID FileWatcher::addWatch( const std::string& directory, FileWatchListener* watcher,
-        if ( mImpl->mIsGeneric || !FileSystem::isRemoteFS( directory ) ) {
+                                                           bool recursive, const std::vector<WatcherOption>& options ) {
-                return mImpl->addWatch( directory, watcher, recursive );
+        if ( mImpl->mIsGeneric || !FileSystem::isRemoteFS( directory ) ) {
-        } else {
+                return mImpl->addWatch( directory, watcher, recursive, options );
-                return Errors::Log::createLastError( Errors::FileRemote, directory );
+        } else {
-        }
+                return Errors::Log::createLastError( Errors::FileRemote, directory );
-}
+        }
+}
-void FileWatcher::removeWatch( const std::string& directory ) {
-        mImpl->removeWatch( directory );
+void FileWatcher::removeWatch( const std::string& directory ) {
-}
+        mImpl->removeWatch( directory );
+}
-void FileWatcher::removeWatch( WatchID watchid ) {
-        mImpl->removeWatch( watchid );
+void FileWatcher::removeWatch( WatchID watchid ) {
-}
+        mImpl->removeWatch( watchid );
+}
-void FileWatcher::watch() {
-        mImpl->watch();
+void FileWatcher::watch() {
-}
+        mImpl->watch();
+}
-std::list<std::string> FileWatcher::directories() {
-        return mImpl->directories();
+std::vector<std::string> FileWatcher::directories() {
-}
+        return mImpl->directories();
+}
-void FileWatcher::followSymlinks( bool follow ) {
-        mFollowSymlinks = follow;
+void FileWatcher::followSymlinks( bool follow ) {
-}
+        mFollowSymlinks = follow;
+}
-const bool& FileWatcher::followSymlinks() const {
-        return mFollowSymlinks;
+const bool& FileWatcher::followSymlinks() const {
-}
+        return mFollowSymlinks;
+}
-void FileWatcher::allowOutOfScopeLinks( bool allow ) {
-        mOutOfScopeLinks = allow;
+void FileWatcher::allowOutOfScopeLinks( bool allow ) {
-}
+        mOutOfScopeLinks = allow;
+}
-const bool& FileWatcher::allowOutOfScopeLinks() const {
-        return mOutOfScopeLinks;
+const bool& FileWatcher::allowOutOfScopeLinks() const {
-}
+        return mOutOfScopeLinks;
+}
-} // namespace efsw
+} // namespace efsw
diff --git a/src/3rdParty/efsw/FileWatcherCWrapper.cpp b/src/3rdParty/efsw/FileWatcherCWrapper.cpp
index 5c49a66..8712d6e 100755..100644
--- a/src/3rdParty/efsw/FileWatcherCWrapper.cpp
+++ b/src/3rdParty/efsw/FileWatcherCWrapper.cpp
@@ -28,12 +28,12 @@ class Watcher_CAPI : public efsw::FileWatchListener {
 */
 static std::vector<Watcher_CAPI*> g_callbacks;
-Watcher_CAPI* find_callback( efsw_watcher watcher, efsw_pfn_fileaction_callback fn ) {
+Watcher_CAPI* find_callback( efsw_watcher watcher, efsw_pfn_fileaction_callback fn, void* param ) {
        for ( std::vector<Watcher_CAPI*>::iterator i = g_callbacks.begin(); i != g_callbacks.end();
                  ++i ) {
                Watcher_CAPI* callback = *i;
-                if ( callback->mFn == fn && callback->mWatcher == watcher )
+                if ( callback->mFn == fn && callback->mWatcher == watcher && callback->mParam == param )
                        return *i;
        }
@@ -71,17 +71,35 @@ const char* efsw_getlasterror() {
        return log_str.c_str();
 }
+EFSW_API void efsw_clearlasterror() {
+        efsw::Errors::Log::clearLastError();
+}
 efsw_watchid efsw_addwatch( efsw_watcher watcher, const char* directory,
                                                        efsw_pfn_fileaction_callback callback_fn, int recursive, void* param ) {
-        Watcher_CAPI* callback = find_callback( watcher, callback_fn );
+        return efsw_addwatch_withoptions( watcher, directory, callback_fn, recursive, 0, 0, param );
+}
+efsw_watchid  efsw_addwatch_withoptions(efsw_watcher watcher, const char* directory,
+                                                                                efsw_pfn_fileaction_callback callback_fn, int recursive,
+                                                                                efsw_watcher_option *options, int options_number,
+                                                                                void* param) {
+        Watcher_CAPI* callback = find_callback( watcher, callback_fn, param );
        if ( callback == NULL ) {
                callback = new Watcher_CAPI( watcher, callback_fn, param );
                g_callbacks.push_back( callback );
        }
+        std::vector<efsw::WatcherOption> watcher_options{};
+        for ( int i = 0; i < options_number; i++ ) {
+                efsw_watcher_option* option = &options[i];
+                watcher_options.emplace_back( efsw::WatcherOption{
+                        static_cast<efsw::Option>(option->option), option->value } );
+        }
        return ( (efsw::FileWatcher*)watcher )
-                ->addWatch( std::string( directory ), callback, TOBOOL( recursive ) );
+                ->addWatch( std::string( directory ), callback, TOBOOL( recursive ), watcher_options );
 }
 void efsw_removewatch( efsw_watcher watcher, const char* directory ) {
diff --git a/src/3rdParty/efsw/FileWatcherFSEvents.cpp b/src/3rdParty/efsw/FileWatcherFSEvents.cpp
index bcfdbe6..70ec2b1 100755..100644
--- a/src/3rdParty/efsw/FileWatcherFSEvents.cpp
+++ b/src/3rdParty/efsw/FileWatcherFSEvents.cpp
@@ -41,6 +41,32 @@ bool FileWatcherFSEvents::isGranular() {
        return getOSXReleaseNumber() >= 11;
 }
+static std::string convertCFStringToStdString( CFStringRef cfString ) {
+        // Try to get the C string pointer directly
+        const char* cStr = CFStringGetCStringPtr( cfString, kCFStringEncodingUTF8 );
+        if ( cStr ) {
+                // If the pointer is valid, directly return a std::string from it
+                return std::string( cStr );
+        } else {
+                // If not, manually convert it
+                CFIndex length = CFStringGetLength( cfString );
+                CFIndex maxSize = CFStringGetMaximumSizeForEncoding( length, kCFStringEncodingUTF8 ) +
+                                                  1; // +1 for null terminator
+                char* buffer = new char[maxSize];
+                if ( CFStringGetCString( cfString, buffer, maxSize, kCFStringEncodingUTF8 ) ) {
+                        std::string result( buffer );
+                        delete[] buffer;
+                        return result;
+                } else {
+                        delete[] buffer;
+                        return "";
+                }
+        }
+}
 void FileWatcherFSEvents::FSEventCallback( ConstFSEventStreamRef /*streamRef*/, void* userData,
                                                                                   size_t numEvents, void* eventPaths,
                                                                                   const FSEventStreamEventFlags eventFlags[],
@@ -51,8 +77,24 @@ void FileWatcherFSEvents::FSEventCallback( ConstFSEventStreamRef /*streamRef*/,
        events.reserve( numEvents );
        for ( size_t i = 0; i < numEvents; i++ ) {
-                events.push_back( FSEvent( std::string( ( (char**)eventPaths )[i] ), (long)eventFlags[i],
+                if ( isGranular() ) {
-                                                                   (Uint64)eventIds[i] ) );
+                        CFDictionaryRef pathInfoDict =
+                                static_cast<CFDictionaryRef>( CFArrayGetValueAtIndex( (CFArrayRef)eventPaths, i ) );
+                        CFStringRef path = static_cast<CFStringRef>(
+                                CFDictionaryGetValue( pathInfoDict, kFSEventStreamEventExtendedDataPathKey ) );
+                        CFNumberRef cfInode = static_cast<CFNumberRef>(
+                                CFDictionaryGetValue( pathInfoDict, kFSEventStreamEventExtendedFileIDKey ) );
+                        if ( cfInode ) {
+                                unsigned long inode = 0;
+                                CFNumberGetValue( cfInode, kCFNumberLongType, &inode );
+                                events.push_back( FSEvent( convertCFStringToStdString( path ), (long)eventFlags[i],
+                                                                                   (Uint64)eventIds[i], inode ) );
+                        }
+                } else {
+                        events.push_back( FSEvent( std::string( ( (char**)eventPaths )[i] ),
+                                                                           (long)eventFlags[i], (Uint64)eventIds[i] ) );
+                }
        }
        watcher->handleActions( events );
@@ -63,7 +105,7 @@ void FileWatcherFSEvents::FSEventCallback( ConstFSEventStreamRef /*streamRef*/,
 }
 FileWatcherFSEvents::FileWatcherFSEvents( FileWatcher* parent ) :
-        FileWatcherImpl( parent ), mRunLoopRef( NULL ), mLastWatchID( 0 ), mThread( NULL ) {
+        FileWatcherImpl( parent ), mLastWatchID( 0 ) {
        mInitOK = true;
        watch();
@@ -72,10 +114,7 @@ FileWatcherFSEvents::FileWatcherFSEvents( FileWatcher* parent ) :
 FileWatcherFSEvents::~FileWatcherFSEvents() {
        mInitOK = false;
-        if ( mRunLoopRef.load() )
+        mWatchCond.notify_all();
-                CFRunLoopStop( mRunLoopRef.load() );
-        efSAFE_DELETE( mThread );
        WatchMap::iterator iter = mWatches.begin();
@@ -84,18 +123,11 @@ FileWatcherFSEvents::~FileWatcherFSEvents() {
                efSAFE_DELETE( watch );
        }
-        mWatches.clear();
 }
 WatchID FileWatcherFSEvents::addWatch( const std::string& directory, FileWatchListener* watcher,
-                                                                           bool recursive ) {
+                                                                           bool recursive, const std::vector<WatcherOption>& options ) {
-        /// Wait to the RunLoopRef to be ready
+        std::string dir( FileSystem::getRealPath( directory ) );
-        while ( NULL == mRunLoopRef.load() ) {
-                System::sleep( 1 );
-        }
-        std::string dir( directory );
        FileInfo fi( dir );
@@ -135,12 +167,18 @@ WatchID FileWatcherFSEvents::addWatch( const std::string& directory, FileWatchLi
        pWatch->Directory = dir;
        pWatch->Recursive = recursive;
        pWatch->FWatcher = this;
+        pWatch->ModifiedFlags =
+                getOptionValue( options, Option::MacModifiedFilter, efswFSEventsModified );
+        pWatch->SanitizeEvents = getOptionValue( options, Option::MacSanitizeEvents, 0 ) != 0;
        pWatch->init();
-        Lock lock( mWatchesLock );
+        {
-        mWatches.insert( std::make_pair( mLastWatchID, pWatch ) );
+                Lock lock( mWatchesLock );
+                mWatches.insert( std::make_pair( mLastWatchID, pWatch ) );
+        }
+        mWatchCond.notify_all();
        return pWatch->ID;
 }
@@ -174,50 +212,20 @@ void FileWatcherFSEvents::removeWatch( WatchID watchid ) {
        efSAFE_DELETE( watch );
 }
-void FileWatcherFSEvents::watch() {
+void FileWatcherFSEvents::watch() {}
-        if ( NULL == mThread ) {
-                mThread = new Thread( &FileWatcherFSEvents::run, this );
-                mThread->launch();
-        }
-}
-void FileWatcherFSEvents::run() {
-        mRunLoopRef = CFRunLoopGetCurrent();
-        while ( mInitOK ) {
-                mNeedInitMutex.lock();
-                if ( !mNeedInit.empty() ) {
-                        for ( std::vector<WatcherFSEvents*>::iterator it = mNeedInit.begin();
-                                  it != mNeedInit.end(); ++it ) {
-                                ( *it )->initAsync();
-                        }
-                        mNeedInit.clear();
-                }
-                mNeedInitMutex.unlock();
-                if ( mWatches.empty() ) {
-                        System::sleep( 100 );
-                } else {
-                        CFRunLoopRunInMode( kCFRunLoopDefaultMode, 0.5, kCFRunLoopRunTimedOut );
-                }
-        }
-        mRunLoopRef = NULL;
-}
 void FileWatcherFSEvents::handleAction( Watcher* /*watch*/, const std::string& /*filename*/,
                                                                                unsigned long /*action*/, std::string /*oldFilename*/ ) {
        /// Not used
 }
-std::list<std::string> FileWatcherFSEvents::directories() {
+std::vector<std::string> FileWatcherFSEvents::directories() {
-        std::list<std::string> dirs;
+        std::vector<std::string> dirs;
        Lock lock( mWatchesLock );
+        dirs.reserve( mWatches.size() );
        for ( WatchMap::iterator it = mWatches.begin(); it != mWatches.end(); ++it ) {
                dirs.push_back( std::string( it->second->Directory ) );
        }
diff --git a/src/3rdParty/efsw/FileWatcherFSEvents.hpp b/src/3rdParty/efsw/FileWatcherFSEvents.hpp
index 5279847..daa538c 100755..100644
--- a/src/3rdParty/efsw/FileWatcherFSEvents.hpp
+++ b/src/3rdParty/efsw/FileWatcherFSEvents.hpp
@@ -7,33 +7,15 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreServices/CoreServices.h>
+#include <dispatch/dispatch.h>
 #include <efsw/WatcherFSEvents.hpp>
-#include <list>
 #include <map>
 #include <vector>
+#include <condition_variable>
+#include <mutex>
 namespace efsw {
-/* OSX < 10.7 has no file events */
-/* So i declare the events constants */
-enum FSEventEvents {
-        efswFSEventStreamCreateFlagFileEvents = 0x00000010,
-        efswFSEventStreamEventFlagItemCreated = 0x00000100,
-        efswFSEventStreamEventFlagItemRemoved = 0x00000200,
-        efswFSEventStreamEventFlagItemInodeMetaMod = 0x00000400,
-        efswFSEventStreamEventFlagItemRenamed = 0x00000800,
-        efswFSEventStreamEventFlagItemModified = 0x00001000,
-        efswFSEventStreamEventFlagItemFinderInfoMod = 0x00002000,
-        efswFSEventStreamEventFlagItemChangeOwner = 0x00004000,
-        efswFSEventStreamEventFlagItemXattrMod = 0x00008000,
-        efswFSEventStreamEventFlagItemIsFile = 0x00010000,
-        efswFSEventStreamEventFlagItemIsDir = 0x00020000,
-        efswFSEventStreamEventFlagItemIsSymlink = 0x00040000,
-        efswFSEventsModified = efswFSEventStreamEventFlagItemFinderInfoMod |
-                                                   efswFSEventStreamEventFlagItemModified |
-                                                   efswFSEventStreamEventFlagItemInodeMetaMod
-};
 /// Implementation for Win32 based on ReadDirectoryChangesW.
 /// @class FileWatcherFSEvents
 class FileWatcherFSEvents : public FileWatcherImpl {
@@ -52,48 +34,43 @@ class FileWatcherFSEvents : public FileWatcherImpl {
        /// Add a directory watch
        /// On error returns WatchID with Error type.
-        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive );
+        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive,
+                          const std::vector<WatcherOption> &options ) override;
        /// Remove a directory watch. This is a brute force lazy search O(nlogn).
-        void removeWatch( const std::string& directory );
+        void removeWatch( const std::string& directory ) override;
        /// Remove a directory watch. This is a map lookup O(logn).
-        void removeWatch( WatchID watchid );
+        void removeWatch( WatchID watchid ) override;
        /// Updates the watcher. Must be called often.
-        void watch();
+        void watch() override;
        /// Handles the action
        void handleAction( Watcher* watch, const std::string& filename, unsigned long action,
-                                           std::string oldFilename = "" );
+                                           std::string oldFilename = "" ) override;
        /// @return Returns a list of the directories that are being watched
-        std::list<std::string> directories();
+        std::vector<std::string> directories() override;
  protected:
        static void FSEventCallback( ConstFSEventStreamRef streamRef, void* userData, size_t numEvents,
                                                                 void* eventPaths, const FSEventStreamEventFlags eventFlags[],
                                                                 const FSEventStreamEventId eventIds[] );
-        Atomic<CFRunLoopRef> mRunLoopRef;
        /// Vector of WatcherWin32 pointers
        WatchMap mWatches;
        /// The last watchid
        WatchID mLastWatchID;
-        Thread* mThread;
        Mutex mWatchesLock;
-        bool pathInWatches( const std::string& path );
+        bool pathInWatches( const std::string& path ) override;
-        std::vector<WatcherFSEvents*> mNeedInit;
+        std::mutex mWatchesMutex;
-        Mutex mNeedInitMutex;
+        std::condition_variable mWatchCond;
-  private:
-        void run();
 };
 } // namespace efsw
diff --git a/src/3rdParty/efsw/FileWatcherGeneric.cpp b/src/3rdParty/efsw/FileWatcherGeneric.cpp
index 074cff1..3f3c52e 100755..100644
--- a/src/3rdParty/efsw/FileWatcherGeneric.cpp
+++ b/src/3rdParty/efsw/FileWatcherGeneric.cpp
@@ -25,7 +25,7 @@ FileWatcherGeneric::~FileWatcherGeneric() {
 }
 WatchID FileWatcherGeneric::addWatch( const std::string& directory, FileWatchListener* watcher,
-                                                                          bool recursive ) {
+                                                                          bool recursive, const std::vector<WatcherOption>& options ) {
        std::string dir( directory );
        FileSystem::dirAddSlashAtEnd( dir );
@@ -127,11 +127,13 @@ void FileWatcherGeneric::handleAction( Watcher*, const std::string&, unsigned lo
        /// Not used
 }
-std::list<std::string> FileWatcherGeneric::directories() {
+std::vector<std::string> FileWatcherGeneric::directories() {
-        std::list<std::string> dirs;
+        std::vector<std::string> dirs;
        Lock lock( mWatchesLock );
+        dirs.reserve( mWatches.size() );
        WatchList::iterator it = mWatches.begin();
        for ( ; it != mWatches.end(); ++it ) {
diff --git a/src/3rdParty/efsw/FileWatcherGeneric.hpp b/src/3rdParty/efsw/FileWatcherGeneric.hpp
index 4cb0b67..47f7e04 100755..100644
--- a/src/3rdParty/efsw/FileWatcherGeneric.hpp
+++ b/src/3rdParty/efsw/FileWatcherGeneric.hpp
@@ -4,7 +4,7 @@
 #include <efsw/DirWatcherGeneric.hpp>
 #include <efsw/FileWatcherImpl.hpp>
 #include <efsw/WatcherGeneric.hpp>
-#include <list>
+#include <vector>
 namespace efsw {
@@ -12,7 +12,7 @@ namespace efsw {
 /// @class FileWatcherGeneric
 class FileWatcherGeneric : public FileWatcherImpl {
  public:
-        typedef std::list<WatcherGeneric*> WatchList;
+        typedef std::vector<WatcherGeneric*> WatchList;
        FileWatcherGeneric( FileWatcher* parent );
@@ -20,23 +20,24 @@ class FileWatcherGeneric : public FileWatcherImpl {
        /// Add a directory watch
        /// On error returns WatchID with Error type.
-        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive );
+        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive,
+                                          const std::vector<WatcherOption> &options ) override;
        /// Remove a directory watch. This is a brute force lazy search O(nlogn).
-        void removeWatch( const std::string& directory );
+        void removeWatch( const std::string& directory ) override;
        /// Remove a directory watch. This is a map lookup O(logn).
-        void removeWatch( WatchID watchid );
+        void removeWatch( WatchID watchid ) override;
        /// Updates the watcher. Must be called often.
-        void watch();
+        void watch() override;
        /// Handles the action
        void handleAction( Watcher* watch, const std::string& filename, unsigned long action,
-                                           std::string oldFilename = "" );
+                                           std::string oldFilename = "" ) override;
        /// @return Returns a list of the directories that are being watched
-        std::list<std::string> directories();
+        std::vector<std::string> directories() override;
  protected:
        Thread* mThread;
@@ -49,7 +50,7 @@ class FileWatcherGeneric : public FileWatcherImpl {
        Mutex mWatchesLock;
-        bool pathInWatches( const std::string& path );
+        bool pathInWatches( const std::string& path ) override;
  private:
        void run();
diff --git a/src/3rdParty/efsw/FileWatcherImpl.cpp b/src/3rdParty/efsw/FileWatcherImpl.cpp
index f6b86a5..bf69a45 100755..100644
--- a/src/3rdParty/efsw/FileWatcherImpl.cpp
+++ b/src/3rdParty/efsw/FileWatcherImpl.cpp
@@ -1,23 +1,34 @@
-#include <efsw/FileWatcherImpl.hpp>
+#include <efsw/FileWatcherImpl.hpp>
-#include <efsw/String.hpp>
+#include <efsw/String.hpp>
-#include <efsw/System.hpp>
+#include <efsw/System.hpp>
-namespace efsw {
+namespace efsw {
-FileWatcherImpl::FileWatcherImpl( FileWatcher* parent ) :
+FileWatcherImpl::FileWatcherImpl( FileWatcher* parent ) :
-        mFileWatcher( parent ), mInitOK( false ), mIsGeneric( false ) {
+        mFileWatcher( parent ), mInitOK( false ), mIsGeneric( false ) {
-        System::maxFD();
+        System::maxFD();
-}
+}
-FileWatcherImpl::~FileWatcherImpl() {}
+FileWatcherImpl::~FileWatcherImpl() {}
-bool FileWatcherImpl::initOK() {
+bool FileWatcherImpl::initOK() {
-        return static_cast<bool>( mInitOK );
+        return static_cast<bool>( mInitOK );
-}
+}
-bool FileWatcherImpl::linkAllowed( const std::string& curPath, const std::string& link ) {
+bool FileWatcherImpl::linkAllowed( const std::string& curPath, const std::string& link ) {
-        return ( mFileWatcher->followSymlinks() && mFileWatcher->allowOutOfScopeLinks() ) ||
+        return ( mFileWatcher->followSymlinks() && mFileWatcher->allowOutOfScopeLinks() ) ||
-                   -1 != String::strStartsWith( curPath, link );
+                   -1 != String::strStartsWith( curPath, link );
-}
+}
-} // namespace efsw
+int FileWatcherImpl::getOptionValue( const std::vector<WatcherOption>& options, Option option,
+                                                                         int defaultValue ) {
+        for ( size_t i = 0; i < options.size(); i++ ) {
+                if ( options[i].mOption == option ) {
+                        return options[i].mValue;
+                }
+        }
+        return defaultValue;
+}
+} // namespace efsw
diff --git a/src/3rdParty/efsw/FileWatcherImpl.hpp b/src/3rdParty/efsw/FileWatcherImpl.hpp
index ea1beb8..a6ec472 100755..100644
--- a/src/3rdParty/efsw/FileWatcherImpl.hpp
+++ b/src/3rdParty/efsw/FileWatcherImpl.hpp
@@ -1,57 +1,64 @@
-#ifndef EFSW_FILEWATCHERIMPL_HPP
+#ifndef EFSW_FILEWATCHERIMPL_HPP
-#define EFSW_FILEWATCHERIMPL_HPP
+#define EFSW_FILEWATCHERIMPL_HPP
-#include <efsw/Atomic.hpp>
+#include <efsw/Atomic.hpp>
-#include <efsw/Mutex.hpp>
+#include <efsw/Mutex.hpp>
-#include <efsw/Thread.hpp>
+#include <efsw/Thread.hpp>
-#include <efsw/Watcher.hpp>
+#include <efsw/Watcher.hpp>
-#include <efsw/base.hpp>
+#include <efsw/base.hpp>
-#include <efsw/efsw.hpp>
+#include <efsw/efsw.hpp>
-namespace efsw {
+namespace efsw {
-class FileWatcherImpl {
+class FileWatcherImpl {
-  public:
+  public:
-        FileWatcherImpl( FileWatcher* parent );
+        FileWatcherImpl( FileWatcher* parent );
-        virtual ~FileWatcherImpl();
+        virtual ~FileWatcherImpl();
-        /// Add a directory watch
+        /// Add a directory watch
-        /// On error returns WatchID with Error type.
+        /// On error returns WatchID with Error type.
-        virtual WatchID addWatch( const std::string& directory, FileWatchListener* watcher,
+        virtual WatchID addWatch( const std::string& directory, FileWatchListener* watcher,
-                                                          bool recursive ) = 0;
+                                                          bool recursive, const std::vector<WatcherOption>& options = {} ) = 0;
-        /// Remove a directory watch. This is a brute force lazy search O(nlogn).
+        /// Remove a directory watch. This is a brute force lazy search O(nlogn).
-        virtual void removeWatch( const std::string& directory ) = 0;
+        virtual void removeWatch( const std::string& directory ) = 0;
-        /// Remove a directory watch. This is a map lookup O(logn).
+        /// Remove a directory watch. This is a map lookup O(logn).
-        virtual void removeWatch( WatchID watchid ) = 0;
+        virtual void removeWatch( WatchID watchid ) = 0;
-        /// Updates the watcher. Must be called often.
+        /// Updates the watcher. Must be called often.
-        virtual void watch() = 0;
+        virtual void watch() = 0;
-        /// Handles the action
+        /// Handles the action
-        virtual void handleAction( Watcher* watch, const std::string& filename, unsigned long action,
+        virtual void handleAction( Watcher* watch, const std::string& filename, unsigned long action,
-                                                           std::string oldFilename = "" ) = 0;
+                                                           std::string oldFilename = "" ) = 0;
-        /// @return Returns a list of the directories that are being watched
+        /// @return Returns a list of the directories that are being watched
-        virtual std::list<std::string> directories() = 0;
+        virtual std::vector<std::string> directories() = 0;
-        /// @return true if the backend init successfully
+        /// @return true if the backend init successfully
-        virtual bool initOK();
+        virtual bool initOK();
-        /// @return If the link is allowed according to the current path and the state of out scope
+        /// @return If the link is allowed according to the current path and the state of out scope
-        /// links
+        /// links
-        virtual bool linkAllowed( const std::string& curPath, const std::string& link );
+        virtual bool linkAllowed( const std::string& curPath, const std::string& link );
-        /// Search if a directory already exists in the watches
+        /// Search if a directory already exists in the watches
-        virtual bool pathInWatches( const std::string& path ) = 0;
+        virtual bool pathInWatches( const std::string& path ) = 0;
-        FileWatcher* mFileWatcher;
+  protected:
-        Atomic<bool> mInitOK;
+        friend class FileWatcher;
-        bool mIsGeneric;
+        friend class DirWatcherGeneric;
-};
+        FileWatcher* mFileWatcher;
-} // namespace efsw
+        Atomic<bool> mInitOK;
+        bool mIsGeneric;
-#endif
+        int getOptionValue( const std::vector<WatcherOption>& options, Option option,
+                                                int defaultValue );
+};
+} // namespace efsw
+#endif
diff --git a/src/3rdParty/efsw/FileWatcherInotify.cpp b/src/3rdParty/efsw/FileWatcherInotify.cpp
index e0da76b..1ec3d48 100755..100644
--- a/src/3rdParty/efsw/FileWatcherInotify.cpp
+++ b/src/3rdParty/efsw/FileWatcherInotify.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <efsw/FileWatcherInotify.hpp>
 #if EFSW_PLATFORM == EFSW_PLATFORM_INOTIFY
@@ -26,7 +27,7 @@
 namespace efsw {
 FileWatcherInotify::FileWatcherInotify( FileWatcher* parent ) :
-        FileWatcherImpl( parent ), mFD( -1 ), mThread( NULL ) {
+        FileWatcherImpl( parent ), mFD( -1 ), mThread( NULL ), mIsTakingAction( false ) {
        mFD = inotify_init();
        if ( mFD < 0 ) {
@@ -38,13 +39,20 @@ FileWatcherInotify::FileWatcherInotify( FileWatcher* parent ) :
 FileWatcherInotify::~FileWatcherInotify() {
        mInitOK = false;
+        // There is deadlock when release FileWatcherInotify instance since its handAction
+        // function is still running and hangs in requiring lock without init lock captured.
+        while ( mIsTakingAction ) {
+                // It'd use condition-wait instead of sleep. Actually efsw has no such
+                // implementation so we just skip and sleep while for that to avoid deadlock.
+                usleep( 1000 );
+        };
        Lock initLock( mInitLock );
        efSAFE_DELETE( mThread );
        Lock l( mWatchesLock );
        Lock l2( mRealWatchesLock );
        WatchMap::iterator iter = mWatches.begin();
        WatchMap::iterator end = mWatches.end();
@@ -61,15 +69,17 @@ FileWatcherInotify::~FileWatcherInotify() {
 }
 WatchID FileWatcherInotify::addWatch( const std::string& directory, FileWatchListener* watcher,
-                                                                          bool recursive ) {
+                                                                          bool recursive, const std::vector<WatcherOption>& options ) {
        if ( !mInitOK )
                return Errors::Log::createLastError( Errors::Unspecified, directory );
        Lock initLock( mInitLock );
-        return addWatch( directory, watcher, recursive, NULL );
+        bool syntheticEvents = getOptionValue( options, Options::LinuxProduceSyntheticEvents, 0 ) != 0;
+        return addWatch( directory, watcher, recursive, syntheticEvents, NULL );
 }
 WatchID FileWatcherInotify::addWatch( const std::string& directory, FileWatchListener* watcher,
-                                                                          bool recursive, WatcherInotify* parent ) {
+                                                                          bool recursive, bool syntheticEvents,
+                                                                          WatcherInotify* parent, bool fromInternalEvent ) {
        std::string dir( directory );
        FileSystem::dirAddSlashAtEnd( dir );
@@ -133,6 +143,7 @@ WatchID FileWatcherInotify::addWatch( const std::string& directory, FileWatchLis
        {
                Lock lock( mWatchesLock );
                mWatches.insert( std::make_pair( wd, pWatch ) );
+                mWatchesRef[pWatch->Directory] = wd;
        }
        if ( NULL == pWatch->Parent ) {
@@ -151,7 +162,17 @@ WatchID FileWatcherInotify::addWatch( const std::string& directory, FileWatchLis
                        const FileInfo& cfi = it->second;
                        if ( cfi.isDirectory() && cfi.isReadable() ) {
-                                addWatch( cfi.Filepath, watcher, recursive, pWatch );
+                                addWatch( cfi.Filepath, watcher, recursive, syntheticEvents, pWatch );
+                        }
+                }
+                if ( fromInternalEvent && parent != NULL && syntheticEvents ) {
+                        for ( const auto& file : files ) {
+                                if ( file.second.isRegularFile() ) {
+                                        pWatch->Listener->handleFileAction(
+                                                pWatch->ID, pWatch->Directory,
+                                                FileSystem::fileNameFromPath( file.second.Filepath ), Actions::Add );
+                                }
                        }
                }
        }
@@ -161,6 +182,8 @@ WatchID FileWatcherInotify::addWatch( const std::string& directory, FileWatchLis
 void FileWatcherInotify::removeWatchLocked( WatchID watchid ) {
        WatchMap::iterator iter = mWatches.find( watchid );
+        if ( iter == mWatches.end() )
+                return;
        WatcherInotify* watch = iter->second;
@@ -173,22 +196,21 @@ void FileWatcherInotify::removeWatchLocked( WatchID watchid ) {
                }
        }
-        if ( watch->Recursive ) {
+        if ( watch->Recursive && NULL == watch->Parent ) {
                WatchMap::iterator it = mWatches.begin();
-                std::list<WatchID> eraseWatches;
+                std::vector<WatchID> eraseWatches;
-                for ( ; it != mWatches.end(); ++it ) {
+                for ( ; it != mWatches.end(); ++it )
-                        if ( it->second != watch && it->second->inParentTree( watch ) ) {
+                        if ( it->second != watch && it->second->inParentTree( watch ) )
                                eraseWatches.push_back( it->second->InotifyID );
-                        }
-                }
-                for ( std::list<WatchID>::iterator eit = eraseWatches.begin(); eit != eraseWatches.end();
+                for ( std::vector<WatchID>::iterator eit = eraseWatches.begin(); eit != eraseWatches.end();
                          ++eit ) {
                        removeWatch( *eit );
                }
        }
+        mWatchesRef.erase( watch->Directory );
        mWatches.erase( iter );
        if ( NULL == watch->Parent ) {
@@ -217,52 +239,11 @@ void FileWatcherInotify::removeWatch( const std::string& directory ) {
        Lock lock( mWatchesLock );
        Lock l( mRealWatchesLock );
-        WatchMap::iterator iter = mWatches.begin();
+        std::unordered_map<std::string, WatchID>::iterator ref = mWatchesRef.find( directory );
+        if ( ref == mWatchesRef.end() )
-        for ( ; iter != mWatches.end(); ++iter ) {
+                return;
-                if ( directory == iter->second->Directory ) {
-                        WatcherInotify* watch = iter->second;
-                        if ( watch->Recursive ) {
-                                WatchMap::iterator it = mWatches.begin();
-                                std::list<WatchID> eraseWatches;
-                                for ( ; it != mWatches.end(); ++it ) {
-                                        if ( it->second->inParentTree( watch ) ) {
-                                                eraseWatches.push_back( it->second->InotifyID );
-                                        }
-                                }
-                                for ( std::list<WatchID>::iterator eit = eraseWatches.begin();
-                                          eit != eraseWatches.end(); ++eit ) {
-                                        removeWatchLocked( *eit );
-                                }
-                        }
-                        mWatches.erase( iter );
-                        if ( NULL == watch->Parent ) {
-                                WatchMap::iterator eraseit = mRealWatches.find( watch->InotifyID );
-                                if ( eraseit != mRealWatches.end() ) {
-                                        mRealWatches.erase( eraseit );
-                                }
-                        }
-                        int err = inotify_rm_watch( mFD, watch->InotifyID );
-                        if ( err < 0 ) {
-                                efDEBUG( "Error removing watch %d: %s\n", watch->InotifyID, strerror( errno ) );
-                        } else {
-                                efDEBUG( "Removed watch %s with id: %d\n", watch->Directory.c_str(),
-                                                 watch->InotifyID );
-                        }
-                        efSAFE_DELETE( watch );
-                        break;
+        removeWatchLocked( ref->second );
-                }
-        }
 }
 void FileWatcherInotify::removeWatch( WatchID watchid ) {
@@ -270,13 +251,6 @@ void FileWatcherInotify::removeWatch( WatchID watchid ) {
                return;
        Lock initLock( mInitLock );
        Lock lock( mWatchesLock );
-        WatchMap::iterator iter = mWatches.find( watchid );
-        if ( iter == mWatches.end() ) {
-                return;
-        }
        removeWatchLocked( watchid );
 }
@@ -295,10 +269,8 @@ Watcher* FileWatcherInotify::watcherContainsDirectory( std::string dir ) {
        for ( WatchMap::iterator it = mWatches.begin(); it != mWatches.end(); ++it ) {
                Watcher* watcher = it->second;
+                if ( watcher->Directory == watcherPath )
-                if ( watcher->Directory == watcherPath ) {
                        return watcher;
-                }
        }
        return NULL;
@@ -422,7 +394,7 @@ void FileWatcherInotify::run() {
                                const std::string& oldFileName = ( *it ).second;
                                /// Check if the file move was a folder already being watched
-                                std::list<Watcher*> eraseWatches;
+                                std::vector<Watcher*> eraseWatches;
                                {
                                        Lock lock( mWatchesLock );
@@ -439,12 +411,15 @@ void FileWatcherInotify::run() {
                                }
                                /// Remove invalid watches
-                                eraseWatches.sort();
+                                std::stable_sort( eraseWatches.begin(), eraseWatches.end(),
+                                                                  []( const Watcher* left, const Watcher* right ) {
+                                                                          return left->Directory < right->Directory;
+                                                                  } );
                                if ( eraseWatches.empty() ) {
                                        handleAction( watch, oldFileName, IN_DELETE );
                                } else {
-                                        for ( std::list<Watcher*>::reverse_iterator eit = eraseWatches.rbegin();
+                                        for ( std::vector<Watcher*>::reverse_iterator eit = eraseWatches.rbegin();
                                                  eit != eraseWatches.rend(); ++eit ) {
                                                Watcher* rmWatch = *eit;
@@ -485,8 +460,9 @@ void FileWatcherInotify::checkForNewWatcher( Watcher* watch, std::string fpath )
                }
                if ( !found ) {
-                        addWatch( fpath, watch->Listener, watch->Recursive,
+                        WatcherInotify* iWatch = static_cast<WatcherInotify*>( watch );
-                                          static_cast<WatcherInotify*>( watch ) );
+                        addWatch( fpath, watch->Listener, watch->Recursive, iWatch->syntheticEvents,
+                                          static_cast<WatcherInotify*>( watch ), true );
                }
        }
 }
@@ -496,7 +472,7 @@ void FileWatcherInotify::handleAction( Watcher* watch, const std::string& filena
        if ( !watch || !watch->Listener || !mInitOK ) {
                return;
        }
+        mIsTakingAction = true;
        Lock initLock( mInitLock );
        std::string fpath( watch->Directory + filename );
@@ -563,18 +539,20 @@ void FileWatcherInotify::handleAction( Watcher* watch, const std::string& filena
                        }
                }
        }
+        mIsTakingAction = false;
 }
-std::list<std::string> FileWatcherInotify::directories() {
+std::vector<std::string> FileWatcherInotify::directories() {
-        std::list<std::string> dirs;
+        std::vector<std::string> dirs;
        Lock l( mRealWatchesLock );
+        dirs.reserve( mRealWatches.size() );
        WatchMap::iterator it = mRealWatches.begin();
-        for ( ; it != mRealWatches.end(); ++it ) {
+        for ( ; it != mRealWatches.end(); ++it )
                dirs.push_back( it->second->Directory );
-        }
        return dirs;
 }
@@ -585,11 +563,9 @@ bool FileWatcherInotify::pathInWatches( const std::string& path ) {
        /// Search in the real watches, since it must allow adding a watch already watched as a subdir
        WatchMap::iterator it = mRealWatches.begin();
-        for ( ; it != mRealWatches.end(); ++it ) {
+        for ( ; it != mRealWatches.end(); ++it )
-                if ( it->second->Directory == path ) {
+                if ( it->second->Directory == path )
                        return true;
-                }
-        }
        return false;
 }
diff --git a/src/3rdParty/efsw/FileWatcherInotify.hpp b/src/3rdParty/efsw/FileWatcherInotify.hpp
index dc922ac..26d2c0b 100755..100644
--- a/src/3rdParty/efsw/FileWatcherInotify.hpp
+++ b/src/3rdParty/efsw/FileWatcherInotify.hpp
@@ -7,6 +7,7 @@
 #include <efsw/WatcherInotify.hpp>
 #include <map>
+#include <unordered_map>
 #include <vector>
 namespace efsw {
@@ -24,23 +25,24 @@ class FileWatcherInotify : public FileWatcherImpl {
        /// Add a directory watch
        /// On error returns WatchID with Error type.
-        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive );
+        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive,
+                                          const std::vector<WatcherOption>& options ) override;
        /// Remove a directory watch. This is a brute force lazy search O(nlogn).
-        void removeWatch( const std::string& directory );
+        void removeWatch( const std::string& directory ) override;
        /// Remove a directory watch. This is a map lookup O(logn).
-        void removeWatch( WatchID watchid );
+        void removeWatch( WatchID watchid ) override;
        /// Updates the watcher. Must be called often.
-        void watch();
+        void watch() override;
        /// Handles the action
        void handleAction( Watcher* watch, const std::string& filename, unsigned long action,
-                                           std::string oldFilename = "" );
+                                           std::string oldFilename = "" ) override;
        /// @return Returns a list of the directories that are being watched
-        std::list<std::string> directories();
+        std::vector<std::string> directories() override;
  protected:
        /// Map of WatchID to WatchStruct pointers
@@ -49,6 +51,8 @@ class FileWatcherInotify : public FileWatcherImpl {
        /// User added watches
        WatchMap mRealWatches;
+        std::unordered_map<std::string, WatchID> mWatchesRef;
        /// inotify file descriptor
        int mFD;
@@ -57,12 +61,14 @@ class FileWatcherInotify : public FileWatcherImpl {
        Mutex mWatchesLock;
        Mutex mRealWatchesLock;
        Mutex mInitLock;
+        bool mIsTakingAction;
        std::vector<std::pair<WatcherInotify*, std::string>> mMovedOutsideWatches;
        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive,
-                                          WatcherInotify* parent = NULL );
+                                          bool syntheticEvents, WatcherInotify* parent = NULL,
+                                          bool fromInternalEvent = false );
-        bool pathInWatches( const std::string& path );
+        bool pathInWatches( const std::string& path ) override;
  private:
        void run();
diff --git a/src/3rdParty/efsw/FileWatcherKqueue.cpp b/src/3rdParty/efsw/FileWatcherKqueue.cpp
index 38ffad9..ad03036 100755..100644
--- a/src/3rdParty/efsw/FileWatcherKqueue.cpp
+++ b/src/3rdParty/efsw/FileWatcherKqueue.cpp
@@ -45,7 +45,7 @@ FileWatcherKqueue::~FileWatcherKqueue() {
 }
 WatchID FileWatcherKqueue::addWatch( const std::string& directory, FileWatchListener* watcher,
-                                                                         bool recursive ) {
+                                                                         bool recursive, const std::vector<WatcherOption>& /*options*/ ) {
        static bool s_ug = false;
        std::string dir( directory );
@@ -184,11 +184,13 @@ void FileWatcherKqueue::run() {
 void FileWatcherKqueue::handleAction( Watcher* /*watch*/, const std::string& /*filename*/,
                                                                          unsigned long /*action*/, std::string /*oldFilename*/ ) {}
-std::list<std::string> FileWatcherKqueue::directories() {
+std::vector<std::string> FileWatcherKqueue::directories() {
-        std::list<std::string> dirs;
+        std::vector<std::string> dirs;
        Lock lock( mWatchesLock );
+        dirs.reserve( mWatches.size() );
        WatchMap::iterator it = mWatches.begin();
        for ( ; it != mWatches.end(); ++it ) {
diff --git a/src/3rdParty/efsw/FileWatcherKqueue.hpp b/src/3rdParty/efsw/FileWatcherKqueue.hpp
index 1bf3755..ff5327b 100755..100644
--- a/src/3rdParty/efsw/FileWatcherKqueue.hpp
+++ b/src/3rdParty/efsw/FileWatcherKqueue.hpp
@@ -21,23 +21,24 @@ class FileWatcherKqueue : public FileWatcherImpl {
        /// Add a directory watch
        /// On error returns WatchID with Error type.
-        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive );
+        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive,
+                                          const std::vector<WatcherOption> &options ) override;
        /// Remove a directory watch. This is a brute force lazy search O(nlogn).
-        void removeWatch( const std::string& directory );
+        void removeWatch( const std::string& directory ) override;
        /// Remove a directory watch. This is a map lookup O(logn).
-        void removeWatch( WatchID watchid );
+        void removeWatch( WatchID watchid ) override;
        /// Updates the watcher. Must be called often.
-        void watch();
+        void watch() override;
        /// Handles the action
        void handleAction( Watcher* watch, const std::string& filename, unsigned long action,
-                                           std::string oldFilename = "" );
+                                           std::string oldFilename = "" ) override;
        /// @return Returns a list of the directories that are being watched
-        std::list<std::string> directories();
+        std::vector<std::string> directories() override;
  protected:
        /// Map of WatchID to WatchStruct pointers
@@ -53,7 +54,7 @@ class FileWatcherKqueue : public FileWatcherImpl {
        Mutex mWatchesLock;
-        std::list<WatchID> mRemoveList;
+        std::vector<WatchID> mRemoveList;
        long mFileDescriptorCount;
@@ -61,7 +62,7 @@ class FileWatcherKqueue : public FileWatcherImpl {
        bool isAddingWatcher() const;
-        bool pathInWatches( const std::string& path );
+        bool pathInWatches( const std::string& path ) override;
        void addFD();
diff --git a/src/3rdParty/efsw/FileWatcherWin32.cpp b/src/3rdParty/efsw/FileWatcherWin32.cpp
index 963dc98..19b71d7 100755..100644
--- a/src/3rdParty/efsw/FileWatcherWin32.cpp
+++ b/src/3rdParty/efsw/FileWatcherWin32.cpp
@@ -1,257 +1,267 @@
-#include <efsw/FileSystem.hpp>
+#include <efsw/FileSystem.hpp>
-#include <efsw/FileWatcherWin32.hpp>
+#include <efsw/FileWatcherWin32.hpp>
-#include <efsw/Lock.hpp>
+#include <efsw/Lock.hpp>
-#include <efsw/String.hpp>
+#include <efsw/String.hpp>
-#include <efsw/System.hpp>
+#include <efsw/System.hpp>
-#if EFSW_PLATFORM == EFSW_PLATFORM_WIN32
+#if EFSW_PLATFORM == EFSW_PLATFORM_WIN32
-namespace efsw {
+namespace efsw {
-FileWatcherWin32::FileWatcherWin32( FileWatcher* parent ) :
+FileWatcherWin32::FileWatcherWin32( FileWatcher* parent ) :
-        FileWatcherImpl( parent ), mLastWatchID( 0 ), mThread( NULL ) {
+        FileWatcherImpl( parent ), mLastWatchID( 0 ), mThread( NULL ) {
-        mIOCP = CreateIoCompletionPort( INVALID_HANDLE_VALUE, NULL, 0, 1 );
+        mIOCP = CreateIoCompletionPort( INVALID_HANDLE_VALUE, NULL, 0, 1 );
-        if ( mIOCP && mIOCP != INVALID_HANDLE_VALUE )
+        if ( mIOCP && mIOCP != INVALID_HANDLE_VALUE )
-                mInitOK = true;
+                mInitOK = true;
-}
+}
-FileWatcherWin32::~FileWatcherWin32() {
+FileWatcherWin32::~FileWatcherWin32() {
-        mInitOK = false;
+        mInitOK = false;
-        if ( mIOCP && mIOCP != INVALID_HANDLE_VALUE ) {
+        if ( mIOCP && mIOCP != INVALID_HANDLE_VALUE ) {
-                PostQueuedCompletionStatus( mIOCP, 0, reinterpret_cast<ULONG_PTR>( this ), NULL );
+                PostQueuedCompletionStatus( mIOCP, 0, reinterpret_cast<ULONG_PTR>( this ), NULL );
-        }
+        }
-        efSAFE_DELETE( mThread );
+        efSAFE_DELETE( mThread );
-        removeAllWatches();
+        removeAllWatches();
-        CloseHandle( mIOCP );
+        if ( mIOCP )
-}
+                CloseHandle( mIOCP );
+}
-WatchID FileWatcherWin32::addWatch( const std::string& directory, FileWatchListener* watcher,
-                                                                        bool recursive ) {
+WatchID FileWatcherWin32::addWatch( const std::string& directory, FileWatchListener* watcher,
-        std::string dir( directory );
+                                                                        bool recursive, const std::vector<WatcherOption> &options ) {
+        std::string dir( directory );
-        FileInfo fi( dir );
+        FileInfo fi( dir );
-        if ( !fi.isDirectory() ) {
-                return Errors::Log::createLastError( Errors::FileNotFound, dir );
+        if ( !fi.isDirectory() ) {
-        } else if ( !fi.isReadable() ) {
+                return Errors::Log::createLastError( Errors::FileNotFound, dir );
-                return Errors::Log::createLastError( Errors::FileNotReadable, dir );
+        } else if ( !fi.isReadable() ) {
-        }
+                return Errors::Log::createLastError( Errors::FileNotReadable, dir );
+        }
-        FileSystem::dirAddSlashAtEnd( dir );
+        FileSystem::dirAddSlashAtEnd( dir );
-        Lock lock( mWatchesLock );
+        Lock lock( mWatchesLock );
-        if ( pathInWatches( dir ) ) {
-                return Errors::Log::createLastError( Errors::FileRepeated, dir );
+        if ( pathInWatches( dir ) ) {
-        }
+                return Errors::Log::createLastError( Errors::FileRepeated, dir );
+        }
-        WatchID watchid = ++mLastWatchID;
+        WatchID watchid = ++mLastWatchID;
-        WatcherStructWin32* watch = CreateWatch(
-                String::fromUtf8( dir ).toWideString().c_str(), recursive,
+        DWORD bufferSize = static_cast<DWORD>( getOptionValue(options, Option::WinBufferSize, 63 * 1024) );
-                FILE_NOTIFY_CHANGE_CREATION | FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_FILE_NAME |
+        DWORD notifyFilter = static_cast<DWORD>( getOptionValue(options, Option::WinNotifyFilter,
-                        FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_SIZE,
+                FILE_NOTIFY_CHANGE_CREATION | FILE_NOTIFY_CHANGE_LAST_WRITE |
-                mIOCP );
+                FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME |
+                FILE_NOTIFY_CHANGE_SIZE) );
-        if ( NULL == watch ) {
-                return Errors::Log::createLastError( Errors::FileNotFound, dir );
+        WatcherStructWin32* watch = CreateWatch( String::fromUtf8( dir ).toWideString().c_str(),
-        }
+                                                                                         recursive, bufferSize, notifyFilter, mIOCP );
-        // Add the handle to the handles vector
+        if ( NULL == watch ) {
-        watch->Watch->ID = watchid;
+                return Errors::Log::createLastError( Errors::FileNotFound, dir );
-        watch->Watch->Watch = this;
+        }
-        watch->Watch->Listener = watcher;
-        watch->Watch->DirName = new char[dir.length() + 1];
+        // Add the handle to the handles vector
-        strcpy( watch->Watch->DirName, dir.c_str() );
+        watch->Watch->ID = watchid;
+        watch->Watch->Watch = this;
-        mWatches.insert( watch );
+        watch->Watch->Listener = watcher;
+        watch->Watch->DirName = new char[dir.length() + 1];
-        return watchid;
+        strcpy( watch->Watch->DirName, dir.c_str() );
-}
+        mWatches.insert( watch );
-void FileWatcherWin32::removeWatch( const std::string& directory ) {
-        Lock lock( mWatchesLock );
+        return watchid;
+}
-        Watches::iterator iter = mWatches.begin();
+void FileWatcherWin32::removeWatch( const std::string& directory ) {
-        for ( ; iter != mWatches.end(); ++iter ) {
+        Lock lock( mWatchesLock );
-                if ( directory == ( *iter )->Watch->DirName ) {
-                        removeWatch( *iter );
+        Watches::iterator iter = mWatches.begin();
-                        break;
-                }
+        for ( ; iter != mWatches.end(); ++iter ) {
-        }
+                if ( directory == ( *iter )->Watch->DirName ) {
-}
+                        removeWatch( *iter );
+                        break;
-void FileWatcherWin32::removeWatch( WatchID watchid ) {
+                }
-        Lock lock( mWatchesLock );
+        }
+}
-        Watches::iterator iter = mWatches.begin();
+void FileWatcherWin32::removeWatch( WatchID watchid ) {
-        for ( ; iter != mWatches.end(); ++iter ) {
+        Lock lock( mWatchesLock );
-                // Find the watch ID
-                if ( ( *iter )->Watch->ID == watchid ) {
+        Watches::iterator iter = mWatches.begin();
-                        removeWatch( *iter );
-                        return;
+        for ( ; iter != mWatches.end(); ++iter ) {
-                }
+                // Find the watch ID
-        }
+                if ( ( *iter )->Watch->ID == watchid ) {
-}
+                        removeWatch( *iter );
+                        return;
-void FileWatcherWin32::removeWatch( WatcherStructWin32* watch ) {
+                }
-        Lock lock( mWatchesLock );
+        }
+}
-        DestroyWatch( watch );
-        mWatches.erase( watch );
+void FileWatcherWin32::removeWatch( WatcherStructWin32* watch ) {
-}
+        Lock lock( mWatchesLock );
-void FileWatcherWin32::watch() {
+        DestroyWatch( watch );
-        if ( NULL == mThread ) {
+        mWatches.erase( watch );
-                mThread = new Thread( &FileWatcherWin32::run, this );
+}
-                mThread->launch();
-        }
+void FileWatcherWin32::watch() {
-}
+        if ( NULL == mThread ) {
+                mThread = new Thread( &FileWatcherWin32::run, this );
-void FileWatcherWin32::removeAllWatches() {
+                mThread->launch();
-        Lock lock( mWatchesLock );
+        }
+}
-        Watches::iterator iter = mWatches.begin();
+void FileWatcherWin32::removeAllWatches() {
-        for ( ; iter != mWatches.end(); ++iter ) {
+        Lock lock( mWatchesLock );
-                DestroyWatch( ( *iter ) );
-        }
+        Watches::iterator iter = mWatches.begin();
-        mWatches.clear();
+        for ( ; iter != mWatches.end(); ++iter ) {
-}
+                DestroyWatch( ( *iter ) );
+        }
-void FileWatcherWin32::run() {
-        do {
+        mWatches.clear();
-                if ( mInitOK && !mWatches.empty() ) {
+}
-                        DWORD numOfBytes = 0;
-                        OVERLAPPED* ov = NULL;
+void FileWatcherWin32::run() {
-                        ULONG_PTR compKey = 0;
+        do {
-                        BOOL res = FALSE;
+                if ( mInitOK && !mWatches.empty() ) {
+                        DWORD numOfBytes = 0;
-                        while ( ( res = GetQueuedCompletionStatus( mIOCP, &numOfBytes, &compKey, &ov,
+                        OVERLAPPED* ov = NULL;
-                                                                                                           INFINITE ) ) != FALSE ) {
+                        ULONG_PTR compKey = 0;
-                                if ( compKey != 0 && compKey == reinterpret_cast<ULONG_PTR>( this ) ) {
+                        BOOL res = FALSE;
-                                        break;
-                                } else {
+                        while ( ( res = GetQueuedCompletionStatus( mIOCP, &numOfBytes, &compKey, &ov,
-                                        Lock lock( mWatchesLock );
+                                                                                                           INFINITE ) ) != FALSE ) {
-                                        WatchCallback( numOfBytes, ov );
+                                if ( compKey != 0 && compKey == reinterpret_cast<ULONG_PTR>( this ) ) {
-                                }
+                                        break;
-                        }
+                                } else {
-                } else {
+                                        Lock lock( mWatchesLock );
-                        System::sleep( 10 );
+                                        if (mWatches.find( (WatcherStructWin32*)ov ) != mWatches.end())
-                }
+                                                WatchCallback( numOfBytes, ov );
-        } while ( mInitOK );
+                                }
+                        }
-        removeAllWatches();
+                } else {
-}
+                        System::sleep( 10 );
+                }
-void FileWatcherWin32::handleAction( Watcher* watch, const std::string& filename,
+        } while ( mInitOK );
-                                                                         unsigned long action, std::string /*oldFilename*/ ) {
-        Action fwAction;
+        removeAllWatches();
+}
-        switch ( action ) {
-                case FILE_ACTION_RENAMED_OLD_NAME:
+void FileWatcherWin32::handleAction( Watcher* watch, const std::string& filename,
-                        watch->OldFileName = filename;
+                                                                         unsigned long action, std::string /*oldFilename*/ ) {
-                        return;
+        Action fwAction;
-                case FILE_ACTION_ADDED:
-                        fwAction = Actions::Add;
+        switch ( action ) {
-                        break;
+                case FILE_ACTION_RENAMED_OLD_NAME:
-                case FILE_ACTION_RENAMED_NEW_NAME: {
+                        watch->OldFileName = filename;
-                        fwAction = Actions::Moved;
+                        return;
+                case FILE_ACTION_ADDED:
-                        std::string fpath( watch->Directory + filename );
+                        fwAction = Actions::Add;
+                        break;
-                        // Update the directory path
+                case FILE_ACTION_RENAMED_NEW_NAME: {
-                        if ( watch->Recursive && FileSystem::isDirectory( fpath ) ) {
+                        fwAction = Actions::Moved;
-                                // Update the new directory path
-                                std::string opath( watch->Directory + watch->OldFileName );
+                        std::string fpath( watch->Directory + filename );
-                                FileSystem::dirAddSlashAtEnd( opath );
-                                FileSystem::dirAddSlashAtEnd( fpath );
+                        // Update the directory path
+                        if ( watch->Recursive && FileSystem::isDirectory( fpath ) ) {
-                                for ( Watches::iterator it = mWatches.begin(); it != mWatches.end(); ++it ) {
+                                // Update the new directory path
-                                        if ( ( *it )->Watch->Directory == opath ) {
+                                std::string opath( watch->Directory + watch->OldFileName );
-                                                ( *it )->Watch->Directory = fpath;
+                                FileSystem::dirAddSlashAtEnd( opath );
+                                FileSystem::dirAddSlashAtEnd( fpath );
-                                                break;
-                                        }
+                                for ( Watches::iterator it = mWatches.begin(); it != mWatches.end(); ++it ) {
-                                }
+                                        if ( ( *it )->Watch->Directory == opath ) {
-                        }
+                                                ( *it )->Watch->Directory = fpath;
-                        std::string folderPath( static_cast<WatcherWin32*>( watch )->DirName );
+                                                break;
-                        std::string realFilename = filename;
+                                        }
-                        std::size_t sepPos = filename.find_last_of( "/\\" );
+                                }
-                        std::string oldFolderPath =
+                        }
-                                static_cast<WatcherWin32*>( watch )->DirName +
-                                watch->OldFileName.substr( 0, watch->OldFileName.find_last_of( "/\\" ) );
+                        std::string folderPath( static_cast<WatcherWin32*>( watch )->DirName );
+                        std::string realFilename = filename;
-                        if ( sepPos != std::string::npos ) {
+                        std::size_t sepPos = filename.find_last_of( "/\\" );
-                                folderPath += filename.substr( 0, sepPos );
+                        std::string oldFolderPath =
-                                realFilename = filename.substr( sepPos + 1 );
+                                static_cast<WatcherWin32*>( watch )->DirName +
-                        }
+                                watch->OldFileName.substr( 0, watch->OldFileName.find_last_of( "/\\" ) );
-                        if ( folderPath == oldFolderPath ) {
+                        if ( sepPos != std::string::npos ) {
-                                watch->Listener->handleFileAction(
+                                folderPath +=
-                                        watch->ID, folderPath, realFilename, fwAction,
+                                        filename.substr( 0, sepPos + 1 < filename.size() ? sepPos + 1 : sepPos );
-                                        FileSystem::fileNameFromPath( watch->OldFileName ) );
+                                realFilename = filename.substr( sepPos + 1 );
-                        } else {
+                        }
-                                watch->Listener->handleFileAction( watch->ID,
-                                                                                                   static_cast<WatcherWin32*>( watch )->DirName,
+                        if ( folderPath == oldFolderPath ) {
-                                                                                                   filename, fwAction, watch->OldFileName );
+                                watch->Listener->handleFileAction(
-                        }
+                                        watch->ID, folderPath, realFilename, fwAction,
-                        return;
+                                        FileSystem::fileNameFromPath( watch->OldFileName ) );
-                }
+                        } else {
-                case FILE_ACTION_REMOVED:
+                                watch->Listener->handleFileAction( watch->ID,
-                        fwAction = Actions::Delete;
+                                                                                                   static_cast<WatcherWin32*>( watch )->DirName,
-                        break;
+                                                                                                   filename, fwAction, watch->OldFileName );
-                case FILE_ACTION_MODIFIED:
+                        }
-                        fwAction = Actions::Modified;
+                        return;
-                        break;
+                }
-                default:
+                case FILE_ACTION_REMOVED:
-                        return;
+                        fwAction = Actions::Delete;
-        };
+                        break;
+                case FILE_ACTION_MODIFIED:
-        std::string folderPath( static_cast<WatcherWin32*>( watch )->DirName );
+                        fwAction = Actions::Modified;
-        std::string realFilename = filename;
+                        break;
-        std::size_t sepPos = filename.find_last_of( "/\\" );
+                default:
+                        return;
-        if ( sepPos != std::string::npos ) {
+        };
-                folderPath += filename.substr( 0, sepPos );
-                realFilename = filename.substr( sepPos + 1 );
+        std::string folderPath( static_cast<WatcherWin32*>( watch )->DirName );
-        }
+        std::string realFilename = filename;
+        std::size_t sepPos = filename.find_last_of( "/\\" );
-        watch->Listener->handleFileAction( watch->ID, folderPath, realFilename, fwAction );
-}
+        if ( sepPos != std::string::npos ) {
+                folderPath += filename.substr( 0, sepPos + 1 < filename.size() ? sepPos + 1 : sepPos );
-std::list<std::string> FileWatcherWin32::directories() {
+                realFilename = filename.substr( sepPos + 1 );
-        std::list<std::string> dirs;
+        }
-        Lock lock( mWatchesLock );
+        FileSystem::dirAddSlashAtEnd( folderPath );
-        for ( Watches::iterator it = mWatches.begin(); it != mWatches.end(); ++it ) {
+        watch->Listener->handleFileAction( watch->ID, folderPath, realFilename, fwAction );
-                dirs.push_back( std::string( ( *it )->Watch->DirName ) );
+}
-        }
+std::vector<std::string> FileWatcherWin32::directories() {
-        return dirs;
+        std::vector<std::string> dirs;
-}
+        Lock lock( mWatchesLock );
-bool FileWatcherWin32::pathInWatches( const std::string& path ) {
-        Lock lock( mWatchesLock );
+        dirs.reserve( mWatches.size() );
-        for ( Watches::iterator it = mWatches.begin(); it != mWatches.end(); ++it ) {
+        for ( Watches::iterator it = mWatches.begin(); it != mWatches.end(); ++it ) {
-                if ( ( *it )->Watch->DirName == path ) {
+                dirs.push_back( std::string( ( *it )->Watch->DirName ) );
-                        return true;
+        }
-                }
-        }
+        return dirs;
+}
-        return false;
-}
+bool FileWatcherWin32::pathInWatches( const std::string& path ) {
+        Lock lock( mWatchesLock );
-} // namespace efsw
+        for ( Watches::iterator it = mWatches.begin(); it != mWatches.end(); ++it ) {
-#endif
+                if ( ( *it )->Watch->DirName == path ) {
+                        return true;
+                }
+        }
+        return false;
+}
+} // namespace efsw
+#endif
diff --git a/src/3rdParty/efsw/FileWatcherWin32.hpp b/src/3rdParty/efsw/FileWatcherWin32.hpp
index 94439cf..3016aac 100755..100644
--- a/src/3rdParty/efsw/FileWatcherWin32.hpp
+++ b/src/3rdParty/efsw/FileWatcherWin32.hpp
@@ -1,70 +1,71 @@
-#ifndef EFSW_FILEWATCHERWIN32_HPP
+#ifndef EFSW_FILEWATCHERWIN32_HPP
-#define EFSW_FILEWATCHERWIN32_HPP
+#define EFSW_FILEWATCHERWIN32_HPP
-#include <efsw/base.hpp>
+#include <efsw/base.hpp>
-#if EFSW_PLATFORM == EFSW_PLATFORM_WIN32
+#if EFSW_PLATFORM == EFSW_PLATFORM_WIN32
-#include <efsw/WatcherWin32.hpp>
+#include <efsw/WatcherWin32.hpp>
-#include <map>
+#include <map>
-#include <set>
+#include <unordered_set>
-#include <vector>
+#include <vector>
-namespace efsw {
+namespace efsw {
-/// Implementation for Win32 based on ReadDirectoryChangesW.
+/// Implementation for Win32 based on ReadDirectoryChangesW.
-/// @class FileWatcherWin32
+/// @class FileWatcherWin32
-class FileWatcherWin32 : public FileWatcherImpl {
+class FileWatcherWin32 : public FileWatcherImpl {
-  public:
+  public:
-        /// type for a map from WatchID to WatcherWin32 pointer
+        /// type for a map from WatchID to WatcherWin32 pointer
-        typedef std::set<WatcherStructWin32*> Watches;
+        typedef std::unordered_set<WatcherStructWin32*> Watches;
-        FileWatcherWin32( FileWatcher* parent );
+        FileWatcherWin32( FileWatcher* parent );
-        virtual ~FileWatcherWin32();
+        virtual ~FileWatcherWin32();
-        /// Add a directory watch
+        /// Add a directory watch
-        /// On error returns WatchID with Error type.
+        /// On error returns WatchID with Error type.
-        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive );
+        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive,
+                                          const std::vector<WatcherOption> &options ) override;
-        /// Remove a directory watch. This is a brute force lazy search O(nlogn).
-        void removeWatch( const std::string& directory );
+        /// Remove a directory watch. This is a brute force lazy search O(nlogn).
+        void removeWatch( const std::string& directory ) override;
-        /// Remove a directory watch. This is a map lookup O(logn).
-        void removeWatch( WatchID watchid );
+        /// Remove a directory watch. This is a map lookup O(logn).
+        void removeWatch( WatchID watchid ) override;
-        /// Updates the watcher. Must be called often.
-        void watch();
+        /// Updates the watcher. Must be called often.
+        void watch() override;
-        /// Handles the action
-        void handleAction( Watcher* watch, const std::string& filename, unsigned long action,
+        /// Handles the action
-                                           std::string oldFilename = "" );
+        void handleAction( Watcher* watch, const std::string& filename, unsigned long action,
+                                           std::string oldFilename = "" ) override;
-        /// @return Returns a list of the directories that are being watched
-        std::list<std::string> directories();
+        /// @return Returns a list of the directories that are being watched
+        std::vector<std::string> directories() override;
-  protected:
-        HANDLE mIOCP;
+  protected:
-        Watches mWatches;
+        HANDLE mIOCP;
+        Watches mWatches;
-        /// The last watchid
-        WatchID mLastWatchID;
+        /// The last watchid
-        Thread* mThread;
+        WatchID mLastWatchID;
-        Mutex mWatchesLock;
+        Thread* mThread;
+        Mutex mWatchesLock;
-        bool pathInWatches( const std::string& path );
+        bool pathInWatches( const std::string& path ) override;
-        /// Remove all directory watches.
-        void removeAllWatches();
+        /// Remove all directory watches.
+        void removeAllWatches();
-        void removeWatch( WatcherStructWin32* watch );
+        void removeWatch( WatcherStructWin32* watch );
-  private:
-        void run();
+  private:
-};
+        void run();
+};
-} // namespace efsw
+} // namespace efsw
-#endif
+#endif
-#endif
+#endif
diff --git a/src/3rdParty/efsw/LICENSE b/src/3rdParty/efsw/LICENSE
index 37f354a..37f354a 100755..100644
--- a/src/3rdParty/efsw/LICENSE
+++ b/src/3rdParty/efsw/LICENSE
diff --git a/src/3rdParty/efsw/Lock.hpp b/src/3rdParty/efsw/Lock.hpp
index e8c522a..e8c522a 100755..100644
--- a/src/3rdParty/efsw/Lock.hpp
+++ b/src/3rdParty/efsw/Lock.hpp
diff --git a/src/3rdParty/efsw/Log.cpp b/src/3rdParty/efsw/Log.cpp
index ddf7a62..6f32df7 100755..100644
--- a/src/3rdParty/efsw/Log.cpp
+++ b/src/3rdParty/efsw/Log.cpp
@@ -1,20 +1,31 @@
 #include <efsw/efsw.hpp>
+#include <efsw/Debug.hpp>
 namespace efsw { namespace Errors {
-static std::string LastError;
+static std::string LastError = "";
+static Error LastErrorCode = NoError;
 std::string Log::getLastErrorLog() {
        return LastError;
 }
+Error Log::getLastErrorCode() {
+        return LastErrorCode;
+}
+void Log::clearLastError() {
+        LastErrorCode = NoError;
+        LastError = "";
+}
 Error Log::createLastError( Error err, std::string log ) {
        switch ( err ) {
                case FileNotFound:
                        LastError = "File not found ( " + log + " )";
                        break;
                case FileRepeated:
-                        LastError = "File reapeated in watches ( " + log + " )";
+                        LastError = "File repeated in watches ( " + log + " )";
                        break;
                case FileOutOfScope:
                        LastError = "Symlink file out of scope ( " + log + " )";
@@ -23,11 +34,15 @@ Error Log::createLastError( Error err, std::string log ) {
                        LastError =
                                "File is located in a remote file system, use a generic watcher. ( " + log + " )";
                        break;
+                case WatcherFailed:
+                        LastError = "File system watcher failed ( " + log + " )";
+                        break;
                case Unspecified:
                default:
                        LastError = log;
        }
+        efDEBUG( "%s\n", LastError.c_str() );
        return err;
 }
diff --git a/src/3rdParty/efsw/Mutex.cpp b/src/3rdParty/efsw/Mutex.cpp
index c961db1..c961db1 100755..100644
--- a/src/3rdParty/efsw/Mutex.cpp
+++ b/src/3rdParty/efsw/Mutex.cpp
diff --git a/src/3rdParty/efsw/Mutex.hpp b/src/3rdParty/efsw/Mutex.hpp
index d98ad17..d98ad17 100755..100644
--- a/src/3rdParty/efsw/Mutex.hpp
+++ b/src/3rdParty/efsw/Mutex.hpp
diff --git a/src/3rdParty/efsw/String.cpp b/src/3rdParty/efsw/String.cpp
index e3ba68f..e3ba68f 100755..100644
--- a/src/3rdParty/efsw/String.cpp
+++ b/src/3rdParty/efsw/String.cpp
diff --git a/src/3rdParty/efsw/String.hpp b/src/3rdParty/efsw/String.hpp
index 65bce33..b42b945 100755..100644
--- a/src/3rdParty/efsw/String.hpp
+++ b/src/3rdParty/efsw/String.hpp
@@ -11,7 +11,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <efsw/base.hpp>
-#include <fstream>
 #include <iostream>
 #include <locale>
 #include <sstream>
@@ -24,7 +23,7 @@ namespace efsw {
 * **/
 class String {
  public:
-        typedef Uint32 StringBaseType;
+        typedef char32_t StringBaseType;
        typedef std::basic_string<StringBaseType> StringType;
        typedef StringType::iterator Iterator;                                                   //! Iterator type
        typedef StringType::const_iterator ConstIterator;                                //! Constant iterator type
diff --git a/src/3rdParty/efsw/System.cpp b/src/3rdParty/efsw/System.cpp
index ba68bf4..ba68bf4 100755..100644
--- a/src/3rdParty/efsw/System.cpp
+++ b/src/3rdParty/efsw/System.cpp
diff --git a/src/3rdParty/efsw/System.hpp b/src/3rdParty/efsw/System.hpp
index 498e121..498e121 100755..100644
--- a/src/3rdParty/efsw/System.hpp
+++ b/src/3rdParty/efsw/System.hpp
diff --git a/src/3rdParty/efsw/Thread.cpp b/src/3rdParty/efsw/Thread.cpp
index e3f0fa0..cfa88b4 100755..100644
--- a/src/3rdParty/efsw/Thread.cpp
+++ b/src/3rdParty/efsw/Thread.cpp
@@ -34,7 +34,8 @@ void Thread::terminate() {
 }
 void Thread::run() {
-        mEntryPoint->run();
+        if ( mEntryPoint )
+                mEntryPoint->run();
 }
 } // namespace efsw
diff --git a/src/3rdParty/efsw/Thread.hpp b/src/3rdParty/efsw/Thread.hpp
index b60373c..b60373c 100755..100644
--- a/src/3rdParty/efsw/Thread.hpp
+++ b/src/3rdParty/efsw/Thread.hpp
diff --git a/src/3rdParty/efsw/Utf.hpp b/src/3rdParty/efsw/Utf.hpp
index 6e9ea71..1b042cd 100755..100644
--- a/src/3rdParty/efsw/Utf.hpp
+++ b/src/3rdParty/efsw/Utf.hpp
@@ -1,721 +1,721 @@
-/** NOTE:
+/** NOTE:
- *      This code is based on the Utf implementation from SFML2. License zlib/png (
+ *      This code is based on the Utf implementation from SFML2. License zlib/png (
- *http://www.sfml-dev.org/license.php ) The class was modified to fit efsw own needs. This is not
+ *http://www.sfml-dev.org/license.php ) The class was modified to fit efsw own needs. This is not
- *the original implementation from SFML2.
+ *the original implementation from SFML2.
- * */
+ * */
-#ifndef EFSW_UTF_HPP
+#ifndef EFSW_UTF_HPP
-#define EFSW_UTF_HPP
+#define EFSW_UTF_HPP
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
-// Headers
+// Headers
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
-#include <cstdlib>
+#include <cstdlib>
-#include <efsw/base.hpp>
+#include <efsw/base.hpp>
-#include <locale>
+#include <locale>
-#include <string>
+#include <string>
-namespace efsw {
+namespace efsw {
-template <unsigned int N> class Utf;
+template <unsigned int N> class Utf;
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
-/// \brief Specialization of the Utf template for UTF-8
+/// \brief Specialization of the Utf template for UTF-8
-///
+///
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
-template <> class Utf<8> {
+template <> class Utf<8> {
-  public:
+  public:
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Decode a single UTF-8 character
+        /// \brief Decode a single UTF-8 character
-        ///
+        ///
-        /// Decoding a character means finding its unique 32-bits
+        /// Decoding a character means finding its unique 32-bits
-        /// code (called the codepoint) in the Unicode standard.
+        /// code (called the codepoint) in the Unicode standard.
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Codepoint of the decoded UTF-8 character
+        /// \param output      Codepoint of the decoded UTF-8 character
-        /// \param replacement Replacement character to use in case the UTF-8 sequence is invalid
+        /// \param replacement Replacement character to use in case the UTF-8 sequence is invalid
-        ///
+        ///
-        /// \return Iterator pointing to one past the last read element of the input sequence
+        /// \return Iterator pointing to one past the last read element of the input sequence
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In>
+        template <typename In>
-        static In Decode( In begin, In end, Uint32& output, Uint32 replacement = 0 );
+        static In Decode( In begin, In end, Uint32& output, Uint32 replacement = 0 );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Encode a single UTF-8 character
+        /// \brief Encode a single UTF-8 character
-        ///
+        ///
-        /// Encoding a character means converting a unique 32-bits
+        /// Encoding a character means converting a unique 32-bits
-        /// code (called the codepoint) in the target encoding, UTF-8.
+        /// code (called the codepoint) in the target encoding, UTF-8.
-        ///
+        ///
-        /// \param input       Codepoint to encode as UTF-8
+        /// \param input       Codepoint to encode as UTF-8
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to UTF-8 (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to UTF-8 (use 0 to skip them)
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename Out> static Out Encode( Uint32 input, Out output, Uint8 replacement = 0 );
+        template <typename Out> static Out Encode( Uint32 input, Out output, Uint8 replacement = 0 );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Advance to the next UTF-8 character
+        /// \brief Advance to the next UTF-8 character
-        ///
+        ///
-        /// This function is necessary for multi-elements encodings, as
+        /// This function is necessary for multi-elements encodings, as
-        /// a single character may use more than 1 storage element.
+        /// a single character may use more than 1 storage element.
-        ///
+        ///
-        /// \param begin Iterator pointing to the beginning of the input sequence
+        /// \param begin Iterator pointing to the beginning of the input sequence
-        /// \param end   Iterator pointing to the end of the input sequence
+        /// \param end   Iterator pointing to the end of the input sequence
-        ///
+        ///
-        /// \return Iterator pointing to one past the last read element of the input sequence
+        /// \return Iterator pointing to one past the last read element of the input sequence
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In> static In Next( In begin, In end );
+        template <typename In> static In Next( In begin, In end );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Count the number of characters of a UTF-8 sequence
+        /// \brief Count the number of characters of a UTF-8 sequence
-        ///
+        ///
-        /// This function is necessary for multi-elements encodings, as
+        /// This function is necessary for multi-elements encodings, as
-        /// a single character may use more than 1 storage element, thus the
+        /// a single character may use more than 1 storage element, thus the
-        /// total size can be different from (begin - end).
+        /// total size can be different from (begin - end).
-        ///
+        ///
-        /// \param begin Iterator pointing to the beginning of the input sequence
+        /// \param begin Iterator pointing to the beginning of the input sequence
-        /// \param end   Iterator pointing to the end of the input sequence
+        /// \param end   Iterator pointing to the end of the input sequence
-        ///
+        ///
-        /// \return Iterator pointing to one past the last read element of the input sequence
+        /// \return Iterator pointing to one past the last read element of the input sequence
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In> static std::size_t Count( In begin, In end );
+        template <typename In> static std::size_t Count( In begin, In end );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an ANSI characters range to UTF-8
+        /// \brief Convert an ANSI characters range to UTF-8
-        ///
+        ///
-        /// The current global locale will be used by default, unless you
+        /// The current global locale will be used by default, unless you
-        /// pass a custom one in the \a locale parameter.
+        /// pass a custom one in the \a locale parameter.
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        /// \param locale Locale to use for conversion
+        /// \param locale Locale to use for conversion
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out FromAnsi( In begin, In end, Out output, const std::locale& locale = std::locale() );
+        static Out FromAnsi( In begin, In end, Out output, const std::locale& locale = std::locale() );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a wide characters range to UTF-8
+        /// \brief Convert a wide characters range to UTF-8
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out FromWide( In begin, In end, Out output );
+        template <typename In, typename Out> static Out FromWide( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a latin-1 (ISO-5589-1) characters range to UTF-8
+        /// \brief Convert a latin-1 (ISO-5589-1) characters range to UTF-8
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        /// \param locale Locale to use for conversion
+        /// \param locale Locale to use for conversion
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out FromLatin1( In begin, In end, Out output );
+        template <typename In, typename Out> static Out FromLatin1( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an UTF-8 characters range to ANSI characters
+        /// \brief Convert an UTF-8 characters range to ANSI characters
-        ///
+        ///
-        /// The current global locale will be used by default, unless you
+        /// The current global locale will be used by default, unless you
-        /// pass a custom one in the \a locale parameter.
+        /// pass a custom one in the \a locale parameter.
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to ANSI (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to ANSI (use 0 to skip them)
-        /// \param locale      Locale to use for conversion
+        /// \param locale      Locale to use for conversion
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out ToAnsi( In begin, In end, Out output, char replacement = 0,
+        static Out ToAnsi( In begin, In end, Out output, char replacement = 0,
-                                           const std::locale& locale = std::locale() );
+                                           const std::locale& locale = std::locale() );
-#ifndef EFSW_NO_WIDECHAR
+#ifndef EFSW_NO_WIDECHAR
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an UTF-8 characters range to wide characters
+        /// \brief Convert an UTF-8 characters range to wide characters
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out ToWide( In begin, In end, Out output, wchar_t replacement = 0 );
+        static Out ToWide( In begin, In end, Out output, wchar_t replacement = 0 );
-#endif
+#endif
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an UTF-8 characters range to latin-1 (ISO-5589-1) characters
+        /// \brief Convert an UTF-8 characters range to latin-1 (ISO-5589-1) characters
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out ToLatin1( In begin, In end, Out output, char replacement = 0 );
+        static Out ToLatin1( In begin, In end, Out output, char replacement = 0 );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a UTF-8 characters range to UTF-8
+        /// \brief Convert a UTF-8 characters range to UTF-8
-        ///
+        ///
-        /// This functions does nothing more than a direct copy;
+        /// This functions does nothing more than a direct copy;
-        /// it is defined only to provide the same interface as other
+        /// it is defined only to provide the same interface as other
-        /// specializations of the efsw::Utf<> template, and allow
+        /// specializations of the efsw::Utf<> template, and allow
-        /// generic code to be written on top of it.
+        /// generic code to be written on top of it.
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out toUtf8( In begin, In end, Out output );
+        template <typename In, typename Out> static Out toUtf8( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a UTF-8 characters range to UTF-16
+        /// \brief Convert a UTF-8 characters range to UTF-16
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out ToUtf16( In begin, In end, Out output );
+        template <typename In, typename Out> static Out ToUtf16( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a UTF-8 characters range to UTF-32
+        /// \brief Convert a UTF-8 characters range to UTF-32
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out ToUtf32( In begin, In end, Out output );
+        template <typename In, typename Out> static Out ToUtf32( In begin, In end, Out output );
-};
+};
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
-/// \brief Specialization of the Utf template for UTF-16
+/// \brief Specialization of the Utf template for UTF-16
-///
+///
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
-template <> class Utf<16> {
+template <> class Utf<16> {
-  public:
+  public:
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Decode a single UTF-16 character
+        /// \brief Decode a single UTF-16 character
-        ///
+        ///
-        /// Decoding a character means finding its unique 32-bits
+        /// Decoding a character means finding its unique 32-bits
-        /// code (called the codepoint) in the Unicode standard.
+        /// code (called the codepoint) in the Unicode standard.
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Codepoint of the decoded UTF-16 character
+        /// \param output      Codepoint of the decoded UTF-16 character
-        /// \param replacement Replacement character to use in case the UTF-8 sequence is invalid
+        /// \param replacement Replacement character to use in case the UTF-8 sequence is invalid
-        ///
+        ///
-        /// \return Iterator pointing to one past the last read element of the input sequence
+        /// \return Iterator pointing to one past the last read element of the input sequence
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In>
+        template <typename In>
-        static In Decode( In begin, In end, Uint32& output, Uint32 replacement = 0 );
+        static In Decode( In begin, In end, Uint32& output, Uint32 replacement = 0 );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Encode a single UTF-16 character
+        /// \brief Encode a single UTF-16 character
-        ///
+        ///
-        /// Encoding a character means converting a unique 32-bits
+        /// Encoding a character means converting a unique 32-bits
-        /// code (called the codepoint) in the target encoding, UTF-16.
+        /// code (called the codepoint) in the target encoding, UTF-16.
-        ///
+        ///
-        /// \param input       Codepoint to encode as UTF-16
+        /// \param input       Codepoint to encode as UTF-16
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to UTF-16 (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to UTF-16 (use 0 to skip them)
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename Out> static Out Encode( Uint32 input, Out output, Uint16 replacement = 0 );
+        template <typename Out> static Out Encode( Uint32 input, Out output, Uint16 replacement = 0 );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Advance to the next UTF-16 character
+        /// \brief Advance to the next UTF-16 character
-        ///
+        ///
-        /// This function is necessary for multi-elements encodings, as
+        /// This function is necessary for multi-elements encodings, as
-        /// a single character may use more than 1 storage element.
+        /// a single character may use more than 1 storage element.
-        ///
+        ///
-        /// \param begin Iterator pointing to the beginning of the input sequence
+        /// \param begin Iterator pointing to the beginning of the input sequence
-        /// \param end   Iterator pointing to the end of the input sequence
+        /// \param end   Iterator pointing to the end of the input sequence
-        ///
+        ///
-        /// \return Iterator pointing to one past the last read element of the input sequence
+        /// \return Iterator pointing to one past the last read element of the input sequence
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In> static In Next( In begin, In end );
+        template <typename In> static In Next( In begin, In end );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Count the number of characters of a UTF-16 sequence
+        /// \brief Count the number of characters of a UTF-16 sequence
-        ///
+        ///
-        /// This function is necessary for multi-elements encodings, as
+        /// This function is necessary for multi-elements encodings, as
-        /// a single character may use more than 1 storage element, thus the
+        /// a single character may use more than 1 storage element, thus the
-        /// total size can be different from (begin - end).
+        /// total size can be different from (begin - end).
-        ///
+        ///
-        /// \param begin Iterator pointing to the beginning of the input sequence
+        /// \param begin Iterator pointing to the beginning of the input sequence
-        /// \param end   Iterator pointing to the end of the input sequence
+        /// \param end   Iterator pointing to the end of the input sequence
-        ///
+        ///
-        /// \return Iterator pointing to one past the last read element of the input sequence
+        /// \return Iterator pointing to one past the last read element of the input sequence
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In> static std::size_t Count( In begin, In end );
+        template <typename In> static std::size_t Count( In begin, In end );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an ANSI characters range to UTF-16
+        /// \brief Convert an ANSI characters range to UTF-16
-        ///
+        ///
-        /// The current global locale will be used by default, unless you
+        /// The current global locale will be used by default, unless you
-        /// pass a custom one in the \a locale parameter.
+        /// pass a custom one in the \a locale parameter.
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        /// \param locale Locale to use for conversion
+        /// \param locale Locale to use for conversion
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out FromAnsi( In begin, In end, Out output, const std::locale& locale = std::locale() );
+        static Out FromAnsi( In begin, In end, Out output, const std::locale& locale = std::locale() );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a wide characters range to UTF-16
+        /// \brief Convert a wide characters range to UTF-16
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out FromWide( In begin, In end, Out output );
+        template <typename In, typename Out> static Out FromWide( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a latin-1 (ISO-5589-1) characters range to UTF-16
+        /// \brief Convert a latin-1 (ISO-5589-1) characters range to UTF-16
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        /// \param locale Locale to use for conversion
+        /// \param locale Locale to use for conversion
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out FromLatin1( In begin, In end, Out output );
+        template <typename In, typename Out> static Out FromLatin1( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an UTF-16 characters range to ANSI characters
+        /// \brief Convert an UTF-16 characters range to ANSI characters
-        ///
+        ///
-        /// The current global locale will be used by default, unless you
+        /// The current global locale will be used by default, unless you
-        /// pass a custom one in the \a locale parameter.
+        /// pass a custom one in the \a locale parameter.
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to ANSI (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to ANSI (use 0 to skip them)
-        /// \param locale      Locale to use for conversion
+        /// \param locale      Locale to use for conversion
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out ToAnsi( In begin, In end, Out output, char replacement = 0,
+        static Out ToAnsi( In begin, In end, Out output, char replacement = 0,
-                                           const std::locale& locale = std::locale() );
+                                           const std::locale& locale = std::locale() );
-#ifndef EFSW_NO_WIDECHAR
+#ifndef EFSW_NO_WIDECHAR
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an UTF-16 characters range to wide characters
+        /// \brief Convert an UTF-16 characters range to wide characters
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out ToWide( In begin, In end, Out output, wchar_t replacement = 0 );
+        static Out ToWide( In begin, In end, Out output, wchar_t replacement = 0 );
-#endif
+#endif
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an UTF-16 characters range to latin-1 (ISO-5589-1) characters
+        /// \brief Convert an UTF-16 characters range to latin-1 (ISO-5589-1) characters
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out ToLatin1( In begin, In end, Out output, char replacement = 0 );
+        static Out ToLatin1( In begin, In end, Out output, char replacement = 0 );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a UTF-16 characters range to UTF-8
+        /// \brief Convert a UTF-16 characters range to UTF-8
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out toUtf8( In begin, In end, Out output );
+        template <typename In, typename Out> static Out toUtf8( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a UTF-16 characters range to UTF-16
+        /// \brief Convert a UTF-16 characters range to UTF-16
-        ///
+        ///
-        /// This functions does nothing more than a direct copy;
+        /// This functions does nothing more than a direct copy;
-        /// it is defined only to provide the same interface as other
+        /// it is defined only to provide the same interface as other
-        /// specializations of the efsw::Utf<> template, and allow
+        /// specializations of the efsw::Utf<> template, and allow
-        /// generic code to be written on top of it.
+        /// generic code to be written on top of it.
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out ToUtf16( In begin, In end, Out output );
+        template <typename In, typename Out> static Out ToUtf16( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a UTF-16 characters range to UTF-32
+        /// \brief Convert a UTF-16 characters range to UTF-32
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out ToUtf32( In begin, In end, Out output );
+        template <typename In, typename Out> static Out ToUtf32( In begin, In end, Out output );
-};
+};
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
-/// \brief Specialization of the Utf template for UTF-32
+/// \brief Specialization of the Utf template for UTF-32
-///
+///
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
-template <> class Utf<32> {
+template <> class Utf<32> {
-  public:
+  public:
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Decode a single UTF-32 character
+        /// \brief Decode a single UTF-32 character
-        ///
+        ///
-        /// Decoding a character means finding its unique 32-bits
+        /// Decoding a character means finding its unique 32-bits
-        /// code (called the codepoint) in the Unicode standard.
+        /// code (called the codepoint) in the Unicode standard.
-        /// For UTF-32, the character value is the same as the codepoint.
+        /// For UTF-32, the character value is the same as the codepoint.
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Codepoint of the decoded UTF-32 character
+        /// \param output      Codepoint of the decoded UTF-32 character
-        /// \param replacement Replacement character to use in case the UTF-8 sequence is invalid
+        /// \param replacement Replacement character to use in case the UTF-8 sequence is invalid
-        ///
+        ///
-        /// \return Iterator pointing to one past the last read element of the input sequence
+        /// \return Iterator pointing to one past the last read element of the input sequence
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In>
+        template <typename In>
-        static In Decode( In begin, In end, Uint32& output, Uint32 replacement = 0 );
+        static In Decode( In begin, In end, Uint32& output, Uint32 replacement = 0 );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Encode a single UTF-32 character
+        /// \brief Encode a single UTF-32 character
-        ///
+        ///
-        /// Encoding a character means converting a unique 32-bits
+        /// Encoding a character means converting a unique 32-bits
-        /// code (called the codepoint) in the target encoding, UTF-32.
+        /// code (called the codepoint) in the target encoding, UTF-32.
-        /// For UTF-32, the codepoint is the same as the character value.
+        /// For UTF-32, the codepoint is the same as the character value.
-        ///
+        ///
-        /// \param input       Codepoint to encode as UTF-32
+        /// \param input       Codepoint to encode as UTF-32
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to UTF-32 (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to UTF-32 (use 0 to skip them)
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename Out> static Out Encode( Uint32 input, Out output, Uint32 replacement = 0 );
+        template <typename Out> static Out Encode( Uint32 input, Out output, Uint32 replacement = 0 );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Advance to the next UTF-32 character
+        /// \brief Advance to the next UTF-32 character
-        ///
+        ///
-        /// This function is trivial for UTF-32, which can store
+        /// This function is trivial for UTF-32, which can store
-        /// every character in a single storage element.
+        /// every character in a single storage element.
-        ///
+        ///
-        /// \param begin Iterator pointing to the beginning of the input sequence
+        /// \param begin Iterator pointing to the beginning of the input sequence
-        /// \param end   Iterator pointing to the end of the input sequence
+        /// \param end   Iterator pointing to the end of the input sequence
-        ///
+        ///
-        /// \return Iterator pointing to one past the last read element of the input sequence
+        /// \return Iterator pointing to one past the last read element of the input sequence
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In> static In Next( In begin, In end );
+        template <typename In> static In Next( In begin, In end );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Count the number of characters of a UTF-32 sequence
+        /// \brief Count the number of characters of a UTF-32 sequence
-        ///
+        ///
-        /// This function is trivial for UTF-32, which can store
+        /// This function is trivial for UTF-32, which can store
-        /// every character in a single storage element.
+        /// every character in a single storage element.
-        ///
+        ///
-        /// \param begin Iterator pointing to the beginning of the input sequence
+        /// \param begin Iterator pointing to the beginning of the input sequence
-        /// \param end   Iterator pointing to the end of the input sequence
+        /// \param end   Iterator pointing to the end of the input sequence
-        ///
+        ///
-        /// \return Iterator pointing to one past the last read element of the input sequence
+        /// \return Iterator pointing to one past the last read element of the input sequence
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In> static std::size_t Count( In begin, In end );
+        template <typename In> static std::size_t Count( In begin, In end );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an ANSI characters range to UTF-32
+        /// \brief Convert an ANSI characters range to UTF-32
-        ///
+        ///
-        /// The current global locale will be used by default, unless you
+        /// The current global locale will be used by default, unless you
-        /// pass a custom one in the \a locale parameter.
+        /// pass a custom one in the \a locale parameter.
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        /// \param locale Locale to use for conversion
+        /// \param locale Locale to use for conversion
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out FromAnsi( In begin, In end, Out output, const std::locale& locale = std::locale() );
+        static Out FromAnsi( In begin, In end, Out output, const std::locale& locale = std::locale() );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a wide characters range to UTF-32
+        /// \brief Convert a wide characters range to UTF-32
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out FromWide( In begin, In end, Out output );
+        template <typename In, typename Out> static Out FromWide( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a latin-1 (ISO-5589-1) characters range to UTF-32
+        /// \brief Convert a latin-1 (ISO-5589-1) characters range to UTF-32
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        /// \param locale Locale to use for conversion
+        /// \param locale Locale to use for conversion
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out FromLatin1( In begin, In end, Out output );
+        template <typename In, typename Out> static Out FromLatin1( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an UTF-32 characters range to ANSI characters
+        /// \brief Convert an UTF-32 characters range to ANSI characters
-        ///
+        ///
-        /// The current global locale will be used by default, unless you
+        /// The current global locale will be used by default, unless you
-        /// pass a custom one in the \a locale parameter.
+        /// pass a custom one in the \a locale parameter.
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to ANSI (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to ANSI (use 0 to skip them)
-        /// \param locale      Locale to use for conversion
+        /// \param locale      Locale to use for conversion
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out ToAnsi( In begin, In end, Out output, char replacement = 0,
+        static Out ToAnsi( In begin, In end, Out output, char replacement = 0,
-                                           const std::locale& locale = std::locale() );
+                                           const std::locale& locale = std::locale() );
-#ifndef EFSW_NO_WIDECHAR
+#ifndef EFSW_NO_WIDECHAR
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an UTF-32 characters range to wide characters
+        /// \brief Convert an UTF-32 characters range to wide characters
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out ToWide( In begin, In end, Out output, wchar_t replacement = 0 );
+        static Out ToWide( In begin, In end, Out output, wchar_t replacement = 0 );
-#endif
+#endif
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert an UTF-16 characters range to latin-1 (ISO-5589-1) characters
+        /// \brief Convert an UTF-16 characters range to latin-1 (ISO-5589-1) characters
-        ///
+        ///
-        /// \param begin       Iterator pointing to the beginning of the input sequence
+        /// \param begin       Iterator pointing to the beginning of the input sequence
-        /// \param end         Iterator pointing to the end of the input sequence
+        /// \param end         Iterator pointing to the end of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
+        /// \param replacement Replacement for characters not convertible to wide (use 0 to skip them)
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out>
+        template <typename In, typename Out>
-        static Out ToLatin1( In begin, In end, Out output, char replacement = 0 );
+        static Out ToLatin1( In begin, In end, Out output, char replacement = 0 );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a UTF-32 characters range to UTF-8
+        /// \brief Convert a UTF-32 characters range to UTF-8
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out toUtf8( In begin, In end, Out output );
+        template <typename In, typename Out> static Out toUtf8( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a UTF-32 characters range to UTF-16
+        /// \brief Convert a UTF-32 characters range to UTF-16
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out ToUtf16( In begin, In end, Out output );
+        template <typename In, typename Out> static Out ToUtf16( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Convert a UTF-32 characters range to UTF-32
+        /// \brief Convert a UTF-32 characters range to UTF-32
-        ///
+        ///
-        /// This functions does nothing more than a direct copy;
+        /// This functions does nothing more than a direct copy;
-        /// it is defined only to provide the same interface as other
+        /// it is defined only to provide the same interface as other
-        /// specializations of the efsw::Utf<> template, and allow
+        /// specializations of the efsw::Utf<> template, and allow
-        /// generic code to be written on top of it.
+        /// generic code to be written on top of it.
-        ///
+        ///
-        /// \param begin  Iterator pointing to the beginning of the input sequence
+        /// \param begin  Iterator pointing to the beginning of the input sequence
-        /// \param end    Iterator pointing to the end of the input sequence
+        /// \param end    Iterator pointing to the end of the input sequence
-        /// \param output Iterator pointing to the beginning of the output sequence
+        /// \param output Iterator pointing to the beginning of the output sequence
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In, typename Out> static Out ToUtf32( In begin, In end, Out output );
+        template <typename In, typename Out> static Out ToUtf32( In begin, In end, Out output );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Decode a single ANSI character to UTF-32
+        /// \brief Decode a single ANSI character to UTF-32
-        ///
+        ///
-        /// This function does not exist in other specializations
+        /// This function does not exist in other specializations
-        /// of efsw::Utf<>, it is defined for convenience (it is used by
+        /// of efsw::Utf<>, it is defined for convenience (it is used by
-        /// several other conversion functions).
+        /// several other conversion functions).
-        ///
+        ///
-        /// \param input  Input ANSI character
+        /// \param input  Input ANSI character
-        /// \param locale Locale to use for conversion
+        /// \param locale Locale to use for conversion
-        ///
+        ///
-        /// \return Converted character
+        /// \return Converted character
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In>
+        template <typename In>
-        static Uint32 DecodeAnsi( In input, const std::locale& locale = std::locale() );
+        static Uint32 DecodeAnsi( In input, const std::locale& locale = std::locale() );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Decode a single wide character to UTF-32
+        /// \brief Decode a single wide character to UTF-32
-        ///
+        ///
-        /// This function does not exist in other specializations
+        /// This function does not exist in other specializations
-        /// of efsw::Utf<>, it is defined for convenience (it is used by
+        /// of efsw::Utf<>, it is defined for convenience (it is used by
-        /// several other conversion functions).
+        /// several other conversion functions).
-        ///
+        ///
-        /// \param input Input wide character
+        /// \param input Input wide character
-        ///
+        ///
-        /// \return Converted character
+        /// \return Converted character
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename In> static Uint32 DecodeWide( In input );
+        template <typename In> static Uint32 DecodeWide( In input );
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Encode a single UTF-32 character to ANSI
+        /// \brief Encode a single UTF-32 character to ANSI
-        ///
+        ///
-        /// This function does not exist in other specializations
+        /// This function does not exist in other specializations
-        /// of efsw::Utf<>, it is defined for convenience (it is used by
+        /// of efsw::Utf<>, it is defined for convenience (it is used by
-        /// several other conversion functions).
+        /// several other conversion functions).
-        ///
+        ///
-        /// \param codepoint   Iterator pointing to the beginning of the input sequence
+        /// \param codepoint   Iterator pointing to the beginning of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement if the input character is not convertible to ANSI (use 0 to
+        /// \param replacement Replacement if the input character is not convertible to ANSI (use 0 to
-        /// skip it) \param locale      Locale to use for conversion
+        /// skip it) \param locale      Locale to use for conversion
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename Out>
+        template <typename Out>
-        static Out EncodeAnsi( Uint32 codepoint, Out output, char replacement = 0,
+        static Out EncodeAnsi( Uint32 codepoint, Out output, char replacement = 0,
-                                                   const std::locale& locale = std::locale() );
+                                                   const std::locale& locale = std::locale() );
-#ifndef EFSW_NO_WIDECHAR
+#ifndef EFSW_NO_WIDECHAR
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        /// \brief Encode a single UTF-32 character to wide
+        /// \brief Encode a single UTF-32 character to wide
-        ///
+        ///
-        /// This function does not exist in other specializations
+        /// This function does not exist in other specializations
-        /// of efsw::Utf<>, it is defined for convenience (it is used by
+        /// of efsw::Utf<>, it is defined for convenience (it is used by
-        /// several other conversion functions).
+        /// several other conversion functions).
-        ///
+        ///
-        /// \param codepoint   Iterator pointing to the beginning of the input sequence
+        /// \param codepoint   Iterator pointing to the beginning of the input sequence
-        /// \param output      Iterator pointing to the beginning of the output sequence
+        /// \param output      Iterator pointing to the beginning of the output sequence
-        /// \param replacement Replacement if the input character is not convertible to wide (use 0 to
+        /// \param replacement Replacement if the input character is not convertible to wide (use 0 to
-        /// skip it)
+        /// skip it)
-        ///
+        ///
-        /// \return Iterator to the end of the output sequence which has been written
+        /// \return Iterator to the end of the output sequence which has been written
-        ///
+        ///
-        ////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////
-        template <typename Out>
+        template <typename Out>
-        static Out EncodeWide( Uint32 codepoint, Out output, wchar_t replacement = 0 );
+        static Out EncodeWide( Uint32 codepoint, Out output, wchar_t replacement = 0 );
-#endif
+#endif
-};
+};
-#include "Utf.inl"
+#include "Utf.inl"
-// Make typedefs to get rid of the template syntax
+// Make typedefs to get rid of the template syntax
-typedef Utf<8> Utf8;
+typedef Utf<8> Utf8;
-typedef Utf<16> Utf16;
+typedef Utf<16> Utf16;
-typedef Utf<32> Utf32;
+typedef Utf<32> Utf32;
-} // namespace efsw
+} // namespace efsw
-#endif
+#endif
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
-/// \class efsw::Utf
+/// \class efsw::Utf
-/// \ingroup system
+/// \ingroup system
-///
+///
-/// Utility class providing generic functions for UTF conversions.
+/// Utility class providing generic functions for UTF conversions.
-///
+///
-/// efsw::Utf is a low-level, generic interface for counting, iterating,
+/// efsw::Utf is a low-level, generic interface for counting, iterating,
-/// encoding and decoding Unicode characters and strings. It is able
+/// encoding and decoding Unicode characters and strings. It is able
-/// to handle ANSI, wide, UTF-8, UTF-16 and UTF-32 encodings.
+/// to handle ANSI, wide, UTF-8, UTF-16 and UTF-32 encodings.
-///
+///
-/// efsw::Utf<X> functions are all static, these classes are not meant to
+/// efsw::Utf<X> functions are all static, these classes are not meant to
-/// be instanciated. All the functions are template, so that you
+/// be instanciated. All the functions are template, so that you
-/// can use any character / string type for a given encoding.
+/// can use any character / string type for a given encoding.
-///
+///
-/// It has 3 specializations:
+/// It has 3 specializations:
-/// \li efsw::Utf<8> (typedef'd to efsw::Utf8)
+/// \li efsw::Utf<8> (typedef'd to efsw::Utf8)
-/// \li efsw::Utf<16> (typedef'd to efsw::Utf16)
+/// \li efsw::Utf<16> (typedef'd to efsw::Utf16)
-/// \li efsw::Utf<32> (typedef'd to efsw::Utf32)
+/// \li efsw::Utf<32> (typedef'd to efsw::Utf32)
-///
+///
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
diff --git a/src/3rdParty/efsw/Utf.inl b/src/3rdParty/efsw/Utf.inl
index 5b6c2e0..5c9d7a3 100755..100644
--- a/src/3rdParty/efsw/Utf.inl
+++ b/src/3rdParty/efsw/Utf.inl
@@ -1,576 +1,576 @@
-// References :
+// References :
-// http://www.unicode.org/
+// http://www.unicode.org/
-// http://www.unicode.org/Public/PROGRAMS/CVTUTF/ConvertUTF.c
+// http://www.unicode.org/Public/PROGRAMS/CVTUTF/ConvertUTF.c
-// http://www.unicode.org/Public/PROGRAMS/CVTUTF/ConvertUTF.h
+// http://www.unicode.org/Public/PROGRAMS/CVTUTF/ConvertUTF.h
-// http://people.w3.org/rishida/scripts/uniview/conversion
+// http://people.w3.org/rishida/scripts/uniview/conversion
-////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
-template <typename In> In Utf<8>::Decode( In begin, In end, Uint32& output, Uint32 replacement ) {
+template <typename In> In Utf<8>::Decode( In begin, In end, Uint32& output, Uint32 replacement ) {
-        // Some useful precomputed data
+        // Some useful precomputed data
-        static const int trailing[256] = {
+        static const int trailing[256] = {
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2,
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2,
-                2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5 };
+                2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5 };
-        static const Uint32 offsets[6] = { 0x00000000, 0x00003080, 0x000E2080,
+        static const Uint32 offsets[6] = { 0x00000000, 0x00003080, 0x000E2080,
-                                                                           0x03C82080, 0xFA082080, 0x82082080 };
+                                                                           0x03C82080, 0xFA082080, 0x82082080 };
-        // Decode the character
+        // Decode the character
-        int trailingBytes = trailing[static_cast<Uint8>( *begin )];
+        int trailingBytes = trailing[static_cast<Uint8>( *begin )];
-        if ( begin + trailingBytes < end ) {
+        if ( begin + trailingBytes < end ) {
-                output = 0;
+                output = 0;
-                switch ( trailingBytes ) {
+                switch ( trailingBytes ) {
-                        case 5:
+                        case 5:
-                                output += static_cast<Uint8>( *begin++ );
+                                output += static_cast<Uint8>( *begin++ );
-                                output <<= 6;
+                                output <<= 6;
-                        case 4:
+                        case 4:
-                                output += static_cast<Uint8>( *begin++ );
+                                output += static_cast<Uint8>( *begin++ );
-                                output <<= 6;
+                                output <<= 6;
-                        case 3:
+                        case 3:
-                                output += static_cast<Uint8>( *begin++ );
+                                output += static_cast<Uint8>( *begin++ );
-                                output <<= 6;
+                                output <<= 6;
-                        case 2:
+                        case 2:
-                                output += static_cast<Uint8>( *begin++ );
+                                output += static_cast<Uint8>( *begin++ );
-                                output <<= 6;
+                                output <<= 6;
-                        case 1:
+                        case 1:
-                                output += static_cast<Uint8>( *begin++ );
+                                output += static_cast<Uint8>( *begin++ );
-                                output <<= 6;
+                                output <<= 6;
-                        case 0:
+                        case 0:
-                                output += static_cast<Uint8>( *begin++ );
+                                output += static_cast<Uint8>( *begin++ );
-                }
+                }
-                output -= offsets[trailingBytes];
+                output -= offsets[trailingBytes];
-        } else {
+        } else {
-                // Incomplete character
+                // Incomplete character
-                begin = end;
+                begin = end;
-                output = replacement;
+                output = replacement;
-        }
+        }
-        return begin;
+        return begin;
-}
+}
-template <typename Out> Out Utf<8>::Encode( Uint32 input, Out output, Uint8 replacement ) {
+template <typename Out> Out Utf<8>::Encode( Uint32 input, Out output, Uint8 replacement ) {
-        // Some useful precomputed data
+        // Some useful precomputed data
-        static const Uint8 firstBytes[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+        static const Uint8 firstBytes[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-        // Encode the character
+        // Encode the character
-        if ( ( input > 0x0010FFFF ) || ( ( input >= 0xD800 ) && ( input <= 0xDBFF ) ) ) {
+        if ( ( input > 0x0010FFFF ) || ( ( input >= 0xD800 ) && ( input <= 0xDBFF ) ) ) {
-                // Invalid character
+                // Invalid character
-                if ( replacement )
+                if ( replacement )
-                        *output++ = replacement;
+                        *output++ = replacement;
-        } else {
+        } else {
-                // Valid character
+                // Valid character
-                // Get the number of bytes to write
+                // Get the number of bytes to write
-                int bytesToWrite = 1;
+                int bytesToWrite = 1;
-                if ( input < 0x80 )
+                if ( input < 0x80 )
-                        bytesToWrite = 1;
+                        bytesToWrite = 1;
-                else if ( input < 0x800 )
+                else if ( input < 0x800 )
-                        bytesToWrite = 2;
+                        bytesToWrite = 2;
-                else if ( input < 0x10000 )
+                else if ( input < 0x10000 )
-                        bytesToWrite = 3;
+                        bytesToWrite = 3;
-                else if ( input <= 0x0010FFFF )
+                else if ( input <= 0x0010FFFF )
-                        bytesToWrite = 4;
+                        bytesToWrite = 4;
-                // Extract the bytes to write
+                // Extract the bytes to write
-                Uint8 bytes[4];
+                Uint8 bytes[4];
-                switch ( bytesToWrite ) {
+                switch ( bytesToWrite ) {
-                        case 4:
+                        case 4:
-                                bytes[3] = static_cast<Uint8>( ( input | 0x80 ) & 0xBF );
+                                bytes[3] = static_cast<Uint8>( ( input | 0x80 ) & 0xBF );
-                                input >>= 6;
+                                input >>= 6;
-                        case 3:
+                        case 3:
-                                bytes[2] = static_cast<Uint8>( ( input | 0x80 ) & 0xBF );
+                                bytes[2] = static_cast<Uint8>( ( input | 0x80 ) & 0xBF );
-                                input >>= 6;
+                                input >>= 6;
-                        case 2:
+                        case 2:
-                                bytes[1] = static_cast<Uint8>( ( input | 0x80 ) & 0xBF );
+                                bytes[1] = static_cast<Uint8>( ( input | 0x80 ) & 0xBF );
-                                input >>= 6;
+                                input >>= 6;
-                        case 1:
+                        case 1:
-                                bytes[0] = static_cast<Uint8>( input | firstBytes[bytesToWrite] );
+                                bytes[0] = static_cast<Uint8>( input | firstBytes[bytesToWrite] );
-                }
+                }
-                // Add them to the output
+                // Add them to the output
-                const Uint8* currentByte = bytes;
+                const Uint8* currentByte = bytes;
-                switch ( bytesToWrite ) {
+                switch ( bytesToWrite ) {
-                        case 4:
+                        case 4:
-                                *output++ = *currentByte++;
+                                *output++ = *currentByte++;
-                        case 3:
+                        case 3:
-                                *output++ = *currentByte++;
+                                *output++ = *currentByte++;
-                        case 2:
+                        case 2:
-                                *output++ = *currentByte++;
+                                *output++ = *currentByte++;
-                        case 1:
+                        case 1:
-                                *output++ = *currentByte++;
+                                *output++ = *currentByte++;
-                }
+                }
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In> In Utf<8>::Next( In begin, In end ) {
+template <typename In> In Utf<8>::Next( In begin, In end ) {
-        Uint32 codepoint;
+        Uint32 codepoint;
-        return Decode( begin, end, codepoint );
+        return Decode( begin, end, codepoint );
-}
+}
-template <typename In> std::size_t Utf<8>::Count( In begin, In end ) {
+template <typename In> std::size_t Utf<8>::Count( In begin, In end ) {
-        std::size_t length = 0;
+        std::size_t length = 0;
-        while ( begin < end ) {
+        while ( begin < end ) {
-                begin = Next( begin, end );
+                begin = Next( begin, end );
-                ++length;
+                ++length;
-        }
+        }
-        return length;
+        return length;
-}
+}
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<8>::FromAnsi( In begin, In end, Out output, const std::locale& locale ) {
+Out Utf<8>::FromAnsi( In begin, In end, Out output, const std::locale& locale ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint = Utf<32>::DecodeAnsi( *begin++, locale );
+                Uint32 codepoint = Utf<32>::DecodeAnsi( *begin++, locale );
-                output = Encode( codepoint, output );
+                output = Encode( codepoint, output );
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<8>::FromWide( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<8>::FromWide( In begin, In end, Out output ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint = Utf<32>::DecodeWide( *begin++ );
+                Uint32 codepoint = Utf<32>::DecodeWide( *begin++ );
-                output = Encode( codepoint, output );
+                output = Encode( codepoint, output );
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<8>::FromLatin1( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<8>::FromLatin1( In begin, In end, Out output ) {
-        // Latin-1 is directly compatible with Unicode encodings,
+        // Latin-1 is directly compatible with Unicode encodings,
-        // and can thus be treated as (a sub-range of) UTF-32
+        // and can thus be treated as (a sub-range of) UTF-32
-        while ( begin < end )
+        while ( begin < end )
-                output = Encode( *begin++, output );
+                output = Encode( *begin++, output );
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<8>::ToAnsi( In begin, In end, Out output, char replacement, const std::locale& locale ) {
+Out Utf<8>::ToAnsi( In begin, In end, Out output, char replacement, const std::locale& locale ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint;
+                Uint32 codepoint;
-                begin = Decode( begin, end, codepoint );
+                begin = Decode( begin, end, codepoint );
-                output = Utf<32>::EncodeAnsi( codepoint, output, replacement, locale );
+                output = Utf<32>::EncodeAnsi( codepoint, output, replacement, locale );
-        }
+        }
-        return output;
+        return output;
-}
+}
-#ifndef EFSW_NO_WIDECHAR
+#ifndef EFSW_NO_WIDECHAR
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<8>::ToWide( In begin, In end, Out output, wchar_t replacement ) {
+Out Utf<8>::ToWide( In begin, In end, Out output, wchar_t replacement ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint;
+                Uint32 codepoint;
-                begin = Decode( begin, end, codepoint );
+                begin = Decode( begin, end, codepoint );
-                output = Utf<32>::EncodeWide( codepoint, output, replacement );
+                output = Utf<32>::EncodeWide( codepoint, output, replacement );
-        }
+        }
-        return output;
+        return output;
-}
+}
-#endif
+#endif
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<8>::ToLatin1( In begin, In end, Out output, char replacement ) {
+Out Utf<8>::ToLatin1( In begin, In end, Out output, char replacement ) {
-        // Latin-1 is directly compatible with Unicode encodings,
+        // Latin-1 is directly compatible with Unicode encodings,
-        // and can thus be treated as (a sub-range of) UTF-32
+        // and can thus be treated as (a sub-range of) UTF-32
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint;
+                Uint32 codepoint;
-                begin = Decode( begin, end, codepoint );
+                begin = Decode( begin, end, codepoint );
-                *output++ = codepoint < 256 ? static_cast<char>( codepoint ) : replacement;
+                *output++ = codepoint < 256 ? static_cast<char>( codepoint ) : replacement;
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<8>::toUtf8( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<8>::toUtf8( In begin, In end, Out output ) {
-        while ( begin < end )
+        while ( begin < end )
-                *output++ = *begin++;
+                *output++ = *begin++;
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<8>::ToUtf16( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<8>::ToUtf16( In begin, In end, Out output ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint;
+                Uint32 codepoint;
-                begin = Decode( begin, end, codepoint );
+                begin = Decode( begin, end, codepoint );
-                output = Utf<16>::Encode( codepoint, output );
+                output = Utf<16>::Encode( codepoint, output );
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<8>::ToUtf32( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<8>::ToUtf32( In begin, In end, Out output ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint;
+                Uint32 codepoint;
-                begin = Decode( begin, end, codepoint );
+                begin = Decode( begin, end, codepoint );
-                *output++ = codepoint;
+                *output++ = codepoint;
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In> In Utf<16>::Decode( In begin, In end, Uint32& output, Uint32 replacement ) {
+template <typename In> In Utf<16>::Decode( In begin, In end, Uint32& output, Uint32 replacement ) {
-        Uint16 first = *begin++;
+        Uint16 first = *begin++;
-        // If it's a surrogate pair, first convert to a single UTF-32 character
+        // If it's a surrogate pair, first convert to a single UTF-32 character
-        if ( ( first >= 0xD800 ) && ( first <= 0xDBFF ) ) {
+        if ( ( first >= 0xD800 ) && ( first <= 0xDBFF ) ) {
-                if ( begin < end ) {
+                if ( begin < end ) {
-                        Uint32 second = *begin++;
+                        Uint32 second = *begin++;
-                        if ( ( second >= 0xDC00 ) && ( second <= 0xDFFF ) ) {
+                        if ( ( second >= 0xDC00 ) && ( second <= 0xDFFF ) ) {
-                                // The second element is valid: convert the two elements to a UTF-32 character
+                                // The second element is valid: convert the two elements to a UTF-32 character
-                                output = static_cast<Uint32>( ( ( first - 0xD800 ) << 10 ) + ( second - 0xDC00 ) +
+                                output = static_cast<Uint32>( ( ( first - 0xD800 ) << 10 ) + ( second - 0xDC00 ) +
-                                                                                          0x0010000 );
+                                                                                          0x0010000 );
-                        } else {
+                        } else {
-                                // Invalid character
+                                // Invalid character
-                                output = replacement;
+                                output = replacement;
-                        }
+                        }
-                } else {
+                } else {
-                        // Invalid character
+                        // Invalid character
-                        begin = end;
+                        begin = end;
-                        output = replacement;
+                        output = replacement;
-                }
+                }
-        } else {
+        } else {
-                // We can make a direct copy
+                // We can make a direct copy
-                output = first;
+                output = first;
-        }
+        }
-        return begin;
+        return begin;
-}
+}
-template <typename Out> Out Utf<16>::Encode( Uint32 input, Out output, Uint16 replacement ) {
+template <typename Out> Out Utf<16>::Encode( Uint32 input, Out output, Uint16 replacement ) {
-        if ( input < 0xFFFF ) {
+        if ( input < 0xFFFF ) {
-                // The character can be copied directly, we just need to check if it's in the valid range
+                // The character can be copied directly, we just need to check if it's in the valid range
-                if ( ( input >= 0xD800 ) && ( input <= 0xDFFF ) ) {
+                if ( ( input >= 0xD800 ) && ( input <= 0xDFFF ) ) {
-                        // Invalid character (this range is reserved)
+                        // Invalid character (this range is reserved)
-                        if ( replacement )
+                        if ( replacement )
-                                *output++ = replacement;
+                                *output++ = replacement;
-                } else {
+                } else {
-                        // Valid character directly convertible to a single UTF-16 character
+                        // Valid character directly convertible to a single UTF-16 character
-                        *output++ = static_cast<Uint16>( input );
+                        *output++ = static_cast<Uint16>( input );
-                }
+                }
-        } else if ( input > 0x0010FFFF ) {
+        } else if ( input > 0x0010FFFF ) {
-                // Invalid character (greater than the maximum unicode value)
+                // Invalid character (greater than the maximum unicode value)
-                if ( replacement )
+                if ( replacement )
-                        *output++ = replacement;
+                        *output++ = replacement;
-        } else {
+        } else {
-                // The input character will be converted to two UTF-16 elements
+                // The input character will be converted to two UTF-16 elements
-                input -= 0x0010000;
+                input -= 0x0010000;
-                *output++ = static_cast<Uint16>( ( input >> 10 ) + 0xD800 );
+                *output++ = static_cast<Uint16>( ( input >> 10 ) + 0xD800 );
-                *output++ = static_cast<Uint16>( ( input & 0x3FFUL ) + 0xDC00 );
+                *output++ = static_cast<Uint16>( ( input & 0x3FFUL ) + 0xDC00 );
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In> In Utf<16>::Next( In begin, In end ) {
+template <typename In> In Utf<16>::Next( In begin, In end ) {
-        Uint32 codepoint;
+        Uint32 codepoint;
-        return Decode( begin, end, codepoint );
+        return Decode( begin, end, codepoint );
-}
+}
-template <typename In> std::size_t Utf<16>::Count( In begin, In end ) {
+template <typename In> std::size_t Utf<16>::Count( In begin, In end ) {
-        std::size_t length = 0;
+        std::size_t length = 0;
-        while ( begin < end ) {
+        while ( begin < end ) {
-                begin = Next( begin, end );
+                begin = Next( begin, end );
-                ++length;
+                ++length;
-        }
+        }
-        return length;
+        return length;
-}
+}
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<16>::FromAnsi( In begin, In end, Out output, const std::locale& locale ) {
+Out Utf<16>::FromAnsi( In begin, In end, Out output, const std::locale& locale ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint = Utf<32>::DecodeAnsi( *begin++, locale );
+                Uint32 codepoint = Utf<32>::DecodeAnsi( *begin++, locale );
-                output = Encode( codepoint, output );
+                output = Encode( codepoint, output );
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<16>::FromWide( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<16>::FromWide( In begin, In end, Out output ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint = Utf<32>::DecodeWide( *begin++ );
+                Uint32 codepoint = Utf<32>::DecodeWide( *begin++ );
-                output = Encode( codepoint, output );
+                output = Encode( codepoint, output );
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<16>::FromLatin1( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<16>::FromLatin1( In begin, In end, Out output ) {
-        // Latin-1 is directly compatible with Unicode encodings,
+        // Latin-1 is directly compatible with Unicode encodings,
-        // and can thus be treated as (a sub-range of) UTF-32
+        // and can thus be treated as (a sub-range of) UTF-32
-        while ( begin < end )
+        while ( begin < end )
-                *output++ = *begin++;
+                *output++ = *begin++;
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<16>::ToAnsi( In begin, In end, Out output, char replacement, const std::locale& locale ) {
+Out Utf<16>::ToAnsi( In begin, In end, Out output, char replacement, const std::locale& locale ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint;
+                Uint32 codepoint;
-                begin = Decode( begin, end, codepoint );
+                begin = Decode( begin, end, codepoint );
-                output = Utf<32>::EncodeAnsi( codepoint, output, replacement, locale );
+                output = Utf<32>::EncodeAnsi( codepoint, output, replacement, locale );
-        }
+        }
-        return output;
+        return output;
-}
+}
-#ifndef EFSW_NO_WIDECHAR
+#ifndef EFSW_NO_WIDECHAR
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<16>::ToWide( In begin, In end, Out output, wchar_t replacement ) {
+Out Utf<16>::ToWide( In begin, In end, Out output, wchar_t replacement ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint;
+                Uint32 codepoint;
-                begin = Decode( begin, end, codepoint );
+                begin = Decode( begin, end, codepoint );
-                output = Utf<32>::EncodeWide( codepoint, output, replacement );
+                output = Utf<32>::EncodeWide( codepoint, output, replacement );
-        }
+        }
-        return output;
+        return output;
-}
+}
-#endif
+#endif
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<16>::ToLatin1( In begin, In end, Out output, char replacement ) {
+Out Utf<16>::ToLatin1( In begin, In end, Out output, char replacement ) {
-        // Latin-1 is directly compatible with Unicode encodings,
+        // Latin-1 is directly compatible with Unicode encodings,
-        // and can thus be treated as (a sub-range of) UTF-32
+        // and can thus be treated as (a sub-range of) UTF-32
-        while ( begin < end ) {
+        while ( begin < end ) {
-                *output++ = *begin < 256 ? static_cast<char>( *begin ) : replacement;
+                *output++ = *begin < 256 ? static_cast<char>( *begin ) : replacement;
-                begin++;
+                begin++;
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<16>::toUtf8( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<16>::toUtf8( In begin, In end, Out output ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint;
+                Uint32 codepoint;
-                begin = Decode( begin, end, codepoint );
+                begin = Decode( begin, end, codepoint );
-                output = Utf<8>::Encode( codepoint, output );
+                output = Utf<8>::Encode( codepoint, output );
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<16>::ToUtf16( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<16>::ToUtf16( In begin, In end, Out output ) {
-        while ( begin < end )
+        while ( begin < end )
-                *output++ = *begin++;
+                *output++ = *begin++;
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<16>::ToUtf32( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<16>::ToUtf32( In begin, In end, Out output ) {
-        while ( begin < end ) {
+        while ( begin < end ) {
-                Uint32 codepoint;
+                Uint32 codepoint;
-                begin = Decode( begin, end, codepoint );
+                begin = Decode( begin, end, codepoint );
-                *output++ = codepoint;
+                *output++ = codepoint;
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In> In Utf<32>::Decode( In begin, In /*end*/, Uint32& output, Uint32 ) {
+template <typename In> In Utf<32>::Decode( In begin, In /*end*/, Uint32& output, Uint32 ) {
-        output = *begin++;
+        output = *begin++;
-        return begin;
+        return begin;
-}
+}
-template <typename Out> Out Utf<32>::Encode( Uint32 input, Out output, Uint32 /*replacement*/ ) {
+template <typename Out> Out Utf<32>::Encode( Uint32 input, Out output, Uint32 /*replacement*/ ) {
-        *output++ = input;
+        *output++ = input;
-        return output;
+        return output;
-}
+}
-template <typename In> In Utf<32>::Next( In begin, In /*end*/ ) {
+template <typename In> In Utf<32>::Next( In begin, In /*end*/ ) {
-        return ++begin;
+        return ++begin;
-}
+}
-template <typename In> std::size_t Utf<32>::Count( In begin, In end ) {
+template <typename In> std::size_t Utf<32>::Count( In begin, In end ) {
-        return begin - end;
+        return begin - end;
-}
+}
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<32>::FromAnsi( In begin, In end, Out output, const std::locale& locale ) {
+Out Utf<32>::FromAnsi( In begin, In end, Out output, const std::locale& locale ) {
-        while ( begin < end )
+        while ( begin < end )
-                *output++ = DecodeAnsi( *begin++, locale );
+                *output++ = DecodeAnsi( *begin++, locale );
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<32>::FromWide( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<32>::FromWide( In begin, In end, Out output ) {
-        while ( begin < end )
+        while ( begin < end )
-                *output++ = DecodeWide( *begin++ );
+                *output++ = DecodeWide( *begin++ );
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<32>::FromLatin1( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<32>::FromLatin1( In begin, In end, Out output ) {
-        // Latin-1 is directly compatible with Unicode encodings,
+        // Latin-1 is directly compatible with Unicode encodings,
-        // and can thus be treated as (a sub-range of) UTF-32
+        // and can thus be treated as (a sub-range of) UTF-32
-        while ( begin < end )
+        while ( begin < end )
-                *output++ = *begin++;
+                *output++ = *begin++;
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<32>::ToAnsi( In begin, In end, Out output, char replacement, const std::locale& locale ) {
+Out Utf<32>::ToAnsi( In begin, In end, Out output, char replacement, const std::locale& locale ) {
-        while ( begin < end )
+        while ( begin < end )
-                output = EncodeAnsi( *begin++, output, replacement, locale );
+                output = EncodeAnsi( *begin++, output, replacement, locale );
-        return output;
+        return output;
-}
+}
-#ifndef EFSW_NO_WIDECHAR
+#ifndef EFSW_NO_WIDECHAR
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<32>::ToWide( In begin, In end, Out output, wchar_t replacement ) {
+Out Utf<32>::ToWide( In begin, In end, Out output, wchar_t replacement ) {
-        while ( begin < end )
+        while ( begin < end )
-                output = EncodeWide( *begin++, output, replacement );
+                output = EncodeWide( *begin++, output, replacement );
-        return output;
+        return output;
-}
+}
-#endif
+#endif
-template <typename In, typename Out>
+template <typename In, typename Out>
-Out Utf<32>::ToLatin1( In begin, In end, Out output, char replacement ) {
+Out Utf<32>::ToLatin1( In begin, In end, Out output, char replacement ) {
-        // Latin-1 is directly compatible with Unicode encodings,
+        // Latin-1 is directly compatible with Unicode encodings,
-        // and can thus be treated as (a sub-range of) UTF-32
+        // and can thus be treated as (a sub-range of) UTF-32
-        while ( begin < end ) {
+        while ( begin < end ) {
-                *output++ = *begin < 256 ? static_cast<char>( *begin ) : replacement;
+                *output++ = *begin < 256 ? static_cast<char>( *begin ) : replacement;
-                begin++;
+                begin++;
-        }
+        }
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<32>::toUtf8( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<32>::toUtf8( In begin, In end, Out output ) {
-        while ( begin < end )
+        while ( begin < end )
-                output = Utf<8>::Encode( *begin++, output );
+                output = Utf<8>::Encode( *begin++, output );
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<32>::ToUtf16( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<32>::ToUtf16( In begin, In end, Out output ) {
-        while ( begin < end )
+        while ( begin < end )
-                output = Utf<16>::Encode( *begin++, output );
+                output = Utf<16>::Encode( *begin++, output );
-        return output;
+        return output;
-}
+}
-template <typename In, typename Out> Out Utf<32>::ToUtf32( In begin, In end, Out output ) {
+template <typename In, typename Out> Out Utf<32>::ToUtf32( In begin, In end, Out output ) {
-        while ( begin < end )
+        while ( begin < end )
-                *output++ = *begin++;
+                *output++ = *begin++;
-        return output;
+        return output;
-}
+}
-template <typename In> Uint32 Utf<32>::DecodeAnsi( In input, const std::locale& locale ) {
+template <typename In> Uint32 Utf<32>::DecodeAnsi( In input, const std::locale& locale ) {
-        // On Windows, gcc's standard library (glibc++) has almost
+        // On Windows, gcc's standard library (glibc++) has almost
-        // no support for Unicode stuff. As a consequence, in this
+        // no support for Unicode stuff. As a consequence, in this
-        // context we can only use the default locale and ignore
+        // context we can only use the default locale and ignore
-        // the one passed as parameter.
+        // the one passed as parameter.
-#if EFSW_PLATFORM == EFSW_PLATFORM_WIN && /* if Windows ... */                  \
+#if EFSW_PLATFORM == EFSW_PLATFORM_WIN && /* if Windows ... */                  \
-        ( defined( __GLIBCPP__ ) ||                                                 \
+        ( defined( __GLIBCPP__ ) ||                                                 \
-          defined( __GLIBCXX__ ) ) && /* ... and standard library is glibc++ ... */ \
+          defined( __GLIBCXX__ ) ) && /* ... and standard library is glibc++ ... */ \
-        !( defined( __SGI_STL_PORT ) ||                                             \
+        !( defined( __SGI_STL_PORT ) ||                                             \
-           defined( _STLPORT_VERSION ) ) /* ... and STLPort is not used on top of it */
+           defined( _STLPORT_VERSION ) ) /* ... and STLPort is not used on top of it */
-        wchar_t character = 0;
+        wchar_t character = 0;
-        mbtowc( &character, &input, 1 );
+        mbtowc( &character, &input, 1 );
-        return static_cast<Uint32>( character );
+        return static_cast<Uint32>( character );
-#else
+#else
-// Get the facet of the locale which deals with character conversion
+// Get the facet of the locale which deals with character conversion
-#ifndef EFSW_NO_WIDECHAR
+#ifndef EFSW_NO_WIDECHAR
-        const std::ctype<wchar_t>& facet = std::use_facet<std::ctype<wchar_t>>( locale );
+        const std::ctype<wchar_t>& facet = std::use_facet<std::ctype<wchar_t>>( locale );
-#else
+#else
-        const std::ctype<char>& facet = std::use_facet<std::ctype<char>>( locale );
+        const std::ctype<char>& facet = std::use_facet<std::ctype<char>>( locale );
-#endif
+#endif
-        // Use the facet to convert each character of the input string
+        // Use the facet to convert each character of the input string
-        return static_cast<Uint32>( facet.widen( input ) );
+        return static_cast<Uint32>( facet.widen( input ) );
-#endif
+#endif
-}
+}
-template <typename In> Uint32 Utf<32>::DecodeWide( In input ) {
+template <typename In> Uint32 Utf<32>::DecodeWide( In input ) {
-        // The encoding of wide characters is not well defined and is left to the system;
+        // The encoding of wide characters is not well defined and is left to the system;
-        // however we can safely assume that it is UCS-2 on Windows and
+        // however we can safely assume that it is UCS-2 on Windows and
-        // UCS-4 on Unix systems.
+        // UCS-4 on Unix systems.
-        // In both cases, a simple copy is enough (UCS-2 is a subset of UCS-4,
+        // In both cases, a simple copy is enough (UCS-2 is a subset of UCS-4,
-        // and UCS-4 *is* UTF-32).
+        // and UCS-4 *is* UTF-32).
-        return input;
+        return input;
-}
+}
-template <typename Out>
+template <typename Out>
-Out Utf<32>::EncodeAnsi( Uint32 codepoint, Out output, char replacement,
+Out Utf<32>::EncodeAnsi( Uint32 codepoint, Out output, char replacement,
-                                                 const std::locale& locale ) {
+                                                 const std::locale& locale ) {
-        // On Windows, gcc's standard library (glibc++) has almost
+        // On Windows, gcc's standard library (glibc++) has almost
-        // no support for Unicode stuff. As a consequence, in this
+        // no support for Unicode stuff. As a consequence, in this
-        // context we can only use the default locale and ignore
+        // context we can only use the default locale and ignore
-        // the one passed as parameter.
+        // the one passed as parameter.
-#if EFSW_PLATFORM == EFSW_PLATFORM_WIN && /* if Windows ... */                  \
+#if EFSW_PLATFORM == EFSW_PLATFORM_WIN && /* if Windows ... */                  \
-        ( defined( __GLIBCPP__ ) ||                                                 \
+        ( defined( __GLIBCPP__ ) ||                                                 \
-          defined( __GLIBCXX__ ) ) && /* ... and standard library is glibc++ ... */ \
+          defined( __GLIBCXX__ ) ) && /* ... and standard library is glibc++ ... */ \
-        !( defined( __SGI_STL_PORT ) ||                                             \
+        !( defined( __SGI_STL_PORT ) ||                                             \
-           defined( _STLPORT_VERSION ) ) /* ... and STLPort is not used on top of it */
+           defined( _STLPORT_VERSION ) ) /* ... and STLPort is not used on top of it */
-        char character = 0;
+        char character = 0;
-        if ( wctomb( &character, static_cast<wchar_t>( codepoint ) ) >= 0 )
+        if ( wctomb( &character, static_cast<wchar_t>( codepoint ) ) >= 0 )
-                *output++ = character;
+                *output++ = character;
-        else if ( replacement )
+        else if ( replacement )
-                *output++ = replacement;
+                *output++ = replacement;
-        return output;
+        return output;
-#else
+#else
-// Get the facet of the locale which deals with character conversion
+// Get the facet of the locale which deals with character conversion
-#ifndef EFSW_NO_WIDECHAR
+#ifndef EFSW_NO_WIDECHAR
-        const std::ctype<wchar_t>& facet = std::use_facet<std::ctype<wchar_t>>( locale );
+        const std::ctype<wchar_t>& facet = std::use_facet<std::ctype<wchar_t>>( locale );
-#else
+#else
-        const std::ctype<char>& facet = std::use_facet<std::ctype<char>>( locale );
+        const std::ctype<char>& facet = std::use_facet<std::ctype<char>>( locale );
-#endif
+#endif
-        // Use the facet to convert each character of the input string
+        // Use the facet to convert each character of the input string
-        *output++ = facet.narrow( static_cast<wchar_t>( codepoint ), replacement );
+        *output++ = facet.narrow( static_cast<wchar_t>( codepoint ), replacement );
-        return output;
+        return output;
-#endif
+#endif
-}
+}
-#ifndef EFSW_NO_WIDECHAR
+#ifndef EFSW_NO_WIDECHAR
-template <typename Out>
+template <typename Out>
-Out Utf<32>::EncodeWide( Uint32 codepoint, Out output, wchar_t replacement ) {
+Out Utf<32>::EncodeWide( Uint32 codepoint, Out output, wchar_t replacement ) {
-        // The encoding of wide characters is not well defined and is left to the system;
+        // The encoding of wide characters is not well defined and is left to the system;
-        // however we can safely assume that it is UCS-2 on Windows and
+        // however we can safely assume that it is UCS-2 on Windows and
-        // UCS-4 on Unix systems.
+        // UCS-4 on Unix systems.
-        // For UCS-2 we need to check if the source characters fits in (UCS-2 is a subset of UCS-4).
+        // For UCS-2 we need to check if the source characters fits in (UCS-2 is a subset of UCS-4).
-        // For UCS-4 we can do a direct copy (UCS-4 *is* UTF-32).
+        // For UCS-4 we can do a direct copy (UCS-4 *is* UTF-32).
-        switch ( sizeof( wchar_t ) ) {
+        switch ( sizeof( wchar_t ) ) {
-                case 4: {
+                case 4: {
-                        *output++ = static_cast<wchar_t>( codepoint );
+                        *output++ = static_cast<wchar_t>( codepoint );
-                        break;
+                        break;
-                }
+                }
-                default: {
+                default: {
-                        if ( ( codepoint <= 0xFFFF ) && ( ( codepoint < 0xD800 ) || ( codepoint > 0xDFFF ) ) ) {
+                        if ( ( codepoint <= 0xFFFF ) && ( ( codepoint < 0xD800 ) || ( codepoint > 0xDFFF ) ) ) {
-                                *output++ = static_cast<wchar_t>( codepoint );
+                                *output++ = static_cast<wchar_t>( codepoint );
-                        } else if ( replacement ) {
+                        } else if ( replacement ) {
-                                *output++ = replacement;
+                                *output++ = replacement;
-                        }
+                        }
-                        break;
+                        break;
-                }
+                }
-        }
+        }
-        return output;
+        return output;
-}
+}
-#endif
+#endif
diff --git a/src/3rdParty/efsw/Watcher.cpp b/src/3rdParty/efsw/Watcher.cpp
index 913ae3c..913ae3c 100755..100644
--- a/src/3rdParty/efsw/Watcher.cpp
+++ b/src/3rdParty/efsw/Watcher.cpp
diff --git a/src/3rdParty/efsw/Watcher.hpp b/src/3rdParty/efsw/Watcher.hpp
index 84f0980..84f0980 100755..100644
--- a/src/3rdParty/efsw/Watcher.hpp
+++ b/src/3rdParty/efsw/Watcher.hpp
diff --git a/src/3rdParty/efsw/WatcherFSEvents.cpp b/src/3rdParty/efsw/WatcherFSEvents.cpp
index b562d3c..f963374 100755..100644
--- a/src/3rdParty/efsw/WatcherFSEvents.cpp
+++ b/src/3rdParty/efsw/WatcherFSEvents.cpp
@@ -8,22 +8,11 @@
 namespace efsw {
 WatcherFSEvents::WatcherFSEvents() :
-        Watcher(), FWatcher( NULL ), FSStream( NULL ), WatcherGen( NULL ), initializedAsync( false ) {}
+        Watcher(), FWatcher( NULL ), FSStream( NULL ), WatcherGen( NULL ) {}
-WatcherFSEvents::WatcherFSEvents( WatchID id, std::string directory, FileWatchListener* listener,
-                                                                  bool recursive, WatcherFSEvents* /*parent*/ ) :
-        Watcher( id, directory, listener, recursive ),
-        FWatcher( NULL ),
-        FSStream( NULL ),
-        WatcherGen( NULL ),
-        initializedAsync( false ) {}
 WatcherFSEvents::~WatcherFSEvents() {
        if ( NULL != FSStream ) {
-                if ( initializedAsync ) {
+                FSEventStreamStop( FSStream );
-                        FSEventStreamStop( FSStream );
-                }
                FSEventStreamInvalidate( FSStream );
                FSEventStreamRelease( FSStream );
        }
@@ -39,7 +28,9 @@ void WatcherFSEvents::init() {
        Uint32 streamFlags = kFSEventStreamCreateFlagNone;
        if ( FileWatcherFSEvents::isGranular() ) {
-                streamFlags = efswFSEventStreamCreateFlagFileEvents;
+                streamFlags = efswFSEventStreamCreateFlagFileEvents | efswFSEventStreamCreateFlagNoDefer |
+                                          efswFSEventStreamCreateFlagUseExtendedData |
+                                          efswFSEventStreamCreateFlagUseCFTypes;
        } else {
                WatcherGen = new WatcherGeneric( ID, Directory, Listener, FWatcher.load(), Recursive );
        }
@@ -52,49 +43,49 @@ void WatcherFSEvents::init() {
        ctx.release = NULL;
        ctx.copyDescription = NULL;
+        dispatch_queue_t queue = dispatch_queue_create( NULL, NULL );
        FSStream =
                FSEventStreamCreate( kCFAllocatorDefault, &FileWatcherFSEvents::FSEventCallback, &ctx,
-                                                         CFDirectoryArray, kFSEventStreamEventIdSinceNow, 0.25, streamFlags );
+                                                         CFDirectoryArray, kFSEventStreamEventIdSinceNow, 0., streamFlags );
-        FWatcher.load()->mNeedInitMutex.lock();
-        FWatcher.load()->mNeedInit.push_back( this );
-        FWatcher.load()->mNeedInitMutex.unlock();
-        CFRelease( CFDirectoryArray );
+        FSEventStreamSetDispatchQueue( FSStream, queue );
-        CFRelease( CFDirectory );
-}
-void WatcherFSEvents::initAsync() {
-        FSEventStreamScheduleWithRunLoop( FSStream, FWatcher.load()->mRunLoopRef.load(),
-                                                                          kCFRunLoopDefaultMode );
        FSEventStreamStart( FSStream );
-        initializedAsync = true;
+        CFRelease( CFDirectoryArray );
+        CFRelease( CFDirectory );
 }
 void WatcherFSEvents::sendFileAction( WatchID watchid, const std::string& dir,
                                                                          const std::string& filename, Action action,
                                                                          std::string oldFilename ) {
        Listener->handleFileAction( watchid, FileSystem::precomposeFileName( dir ),
-                                                                FileSystem::precomposeFileName( filename ), action, oldFilename );
+                                                                FileSystem::precomposeFileName( filename ), action,
+                                                                FileSystem::precomposeFileName( oldFilename ) );
 }
 void WatcherFSEvents::handleAddModDel( const Uint32& flags, const std::string& path,
-                                                                           std::string& dirPath, std::string& filePath ) {
+                                                                           std::string& dirPath, std::string& filePath, Uint64 inode ) {
-        if ( flags & efswFSEventStreamEventFlagItemCreated ) {
+        if ( ( flags & efswFSEventStreamEventFlagItemCreated ) && FileInfo::exists( path ) &&
-                if ( FileInfo::exists( path ) ) {
+                 ( !SanitizeEvents || FilesAdded.find( inode ) != FilesAdded.end() ) ) {
-                        sendFileAction( ID, dirPath, filePath, Actions::Add );
+                sendFileAction( ID, dirPath, filePath, Actions::Add );
-                }
+                if ( SanitizeEvents )
+                        FilesAdded.insert( inode );
        }
-        if ( flags & efswFSEventsModified ) {
+        if ( flags & ModifiedFlags ) {
                sendFileAction( ID, dirPath, filePath, Actions::Modified );
        }
-        if ( flags & efswFSEventStreamEventFlagItemRemoved ) {
+        if ( ( flags & efswFSEventStreamEventFlagItemRemoved ) && !FileInfo::exists( path ) ) {
                // Since i don't know the order, at least i try to keep the data consistent with the real
                // state
-                if ( !FileInfo::exists( path ) ) {
+                sendFileAction( ID, dirPath, filePath, Actions::Delete );
-                        sendFileAction( ID, dirPath, filePath, Actions::Delete );
-                }
+                if ( SanitizeEvents )
+                        FilesAdded.erase( inode );
        }
 }
@@ -136,19 +127,20 @@ void WatcherFSEvents::handleActions( std::vector<FSEvent>& events ) {
                        // been added modified and erased, but i can't know if first was erased and then added
                        // and modified, or added, then modified and then erased. I don't know what they were
                        // thinking by doing this...
-                        efDEBUG( "Event in: %s - flags: %ld\n", event.Path.c_str(), event.Flags );
+                        efDEBUG( "Event in: %s - flags: 0x%x\n", event.Path.c_str(), event.Flags );
                        if ( event.Flags & efswFSEventStreamEventFlagItemRenamed ) {
                                if ( ( i + 1 < esize ) &&
                                         ( events[i + 1].Flags & efswFSEventStreamEventFlagItemRenamed ) &&
-                                         ( events[i + 1].Id == event.Id + 1 ) ) {
+                                         ( events[i + 1].inode == event.inode ) ) {
                                        FSEvent& nEvent = events[i + 1];
                                        std::string newDir( FileSystem::pathRemoveFileName( nEvent.Path ) );
                                        std::string newFilepath( FileSystem::fileNameFromPath( nEvent.Path ) );
                                        if ( event.Path != nEvent.Path ) {
                                                if ( dirPath == newDir ) {
-                                                        if ( !FileInfo::exists( event.Path ) ) {
+                                                        if ( !FileInfo::exists( event.Path ) ||
+                                                                 0 == strcasecmp( event.Path.c_str(), nEvent.Path.c_str() ) ) {
                                                                sendFileAction( ID, dirPath, newFilepath, Actions::Moved,
                                                                                                filePath );
                                                        } else {
@@ -159,12 +151,12 @@ void WatcherFSEvents::handleActions( std::vector<FSEvent>& events ) {
                                                        sendFileAction( ID, dirPath, filePath, Actions::Delete );
                                                        sendFileAction( ID, newDir, newFilepath, Actions::Add );
-                                                        if ( nEvent.Flags & efswFSEventsModified ) {
+                                                        if ( nEvent.Flags & ModifiedFlags ) {
                                                                sendFileAction( ID, newDir, newFilepath, Actions::Modified );
                                                        }
                                                }
                                        } else {
-                                                handleAddModDel( nEvent.Flags, nEvent.Path, dirPath, filePath );
+                                                handleAddModDel( nEvent.Flags, nEvent.Path, dirPath, filePath, event.inode );
                                        }
                                        if ( nEvent.Flags & ( efswFSEventStreamEventFlagItemCreated |
@@ -180,14 +172,14 @@ void WatcherFSEvents::handleActions( std::vector<FSEvent>& events ) {
                                } else if ( FileInfo::exists( event.Path ) ) {
                                        sendFileAction( ID, dirPath, filePath, Actions::Add );
-                                        if ( event.Flags & efswFSEventsModified ) {
+                                        if ( event.Flags & ModifiedFlags ) {
                                                sendFileAction( ID, dirPath, filePath, Actions::Modified );
                                        }
                                } else {
                                        sendFileAction( ID, dirPath, filePath, Actions::Delete );
                                }
                        } else {
-                                handleAddModDel( event.Flags, event.Path, dirPath, filePath );
+                                handleAddModDel( event.Flags, event.Path, dirPath, filePath, event.inode );
                        }
                } else {
                        efDEBUG( "Directory: %s changed\n", event.Path.c_str() );
@@ -197,7 +189,7 @@ void WatcherFSEvents::handleActions( std::vector<FSEvent>& events ) {
 }
 void WatcherFSEvents::process() {
-        std::set<std::string>::iterator it = DirsChanged.begin();
+        std::unordered_set<std::string>::iterator it = DirsChanged.begin();
        for ( ; it != DirsChanged.end(); it++ ) {
                if ( !FileWatcherFSEvents::isGranular() ) {
diff --git a/src/3rdParty/efsw/WatcherFSEvents.hpp b/src/3rdParty/efsw/WatcherFSEvents.hpp
index 4dbb231..f05b094 100755..100644
--- a/src/3rdParty/efsw/WatcherFSEvents.hpp
+++ b/src/3rdParty/efsw/WatcherFSEvents.hpp
@@ -9,51 +9,72 @@
 #include <CoreServices/CoreServices.h>
 #include <efsw/FileInfo.hpp>
 #include <efsw/WatcherGeneric.hpp>
-#include <set>
+#include <unordered_set>
 #include <vector>
 namespace efsw {
+/* OSX < 10.7 has no file events */
+/* So i declare the events constants */
+enum FSEventEvents {
+        efswFSEventStreamCreateFlagUseCFTypes = 0x00000001,
+        efswFSEventStreamCreateFlagNoDefer = 0x00000002,
+        efswFSEventStreamCreateFlagFileEvents = 0x00000010,
+        efswFSEventStreamCreateFlagUseExtendedData = 0x00000040,
+        efswFSEventStreamEventFlagItemCreated = 0x00000100,
+        efswFSEventStreamEventFlagItemRemoved = 0x00000200,
+        efswFSEventStreamEventFlagItemInodeMetaMod = 0x00000400,
+        efswFSEventStreamEventFlagItemRenamed = 0x00000800,
+        efswFSEventStreamEventFlagItemModified = 0x00001000,
+        efswFSEventStreamEventFlagItemFinderInfoMod = 0x00002000,
+        efswFSEventStreamEventFlagItemChangeOwner = 0x00004000,
+        efswFSEventStreamEventFlagItemXattrMod = 0x00008000,
+        efswFSEventStreamEventFlagItemIsFile = 0x00010000,
+        efswFSEventStreamEventFlagItemIsDir = 0x00020000,
+        efswFSEventStreamEventFlagItemIsSymlink = 0x00040000,
+        efswFSEventsModified = efswFSEventStreamEventFlagItemFinderInfoMod |
+                                                   efswFSEventStreamEventFlagItemModified |
+                                                   efswFSEventStreamEventFlagItemInodeMetaMod
+};
 class FileWatcherFSEvents;
 class FSEvent {
  public:
-        FSEvent( std::string path, long flags, Uint64 id ) : Path( path ), Flags( flags ), Id( id ) {}
+        FSEvent( std::string path, long flags, Uint64 id, Uint64 inode = 0 ) :
+                Path( path ), Flags( flags ), Id( id ), inode( inode ) {}
        std::string Path;
-        long Flags;
+        long Flags{ 0 };
-        Uint64 Id;
+        Uint64 Id{ 0 };
+        Uint64 inode{ 0 };
 };
 class WatcherFSEvents : public Watcher {
  public:
        WatcherFSEvents();
-        WatcherFSEvents( WatchID id, std::string directory, FileWatchListener* listener, bool recursive,
-                                         WatcherFSEvents* parent = NULL );
        ~WatcherFSEvents();
        void init();
-        void initAsync();
        void handleActions( std::vector<FSEvent>& events );
        void process();
        Atomic<FileWatcherFSEvents*> FWatcher;
        FSEventStreamRef FSStream;
+        Uint64 ModifiedFlags{ efswFSEventsModified };
+        bool SanitizeEvents{ false };
  protected:
        void handleAddModDel( const Uint32& flags, const std::string& path, std::string& dirPath,
-                                                  std::string& filePath );
+                                                  std::string& filePath, Uint64 inode );
        WatcherGeneric* WatcherGen;
-        Atomic<bool> initializedAsync;
+        std::unordered_set<std::string> DirsChanged;
+        std::unordered_set<Uint64> FilesAdded;
-        std::set<std::string> DirsChanged;
        void sendFileAction( WatchID watchid, const std::string& dir, const std::string& filename,
                                                 Action action, std::string oldFilename = "" );
diff --git a/src/3rdParty/efsw/WatcherGeneric.cpp b/src/3rdParty/efsw/WatcherGeneric.cpp
index a6bb106..a6bb106 100755..100644
--- a/src/3rdParty/efsw/WatcherGeneric.cpp
+++ b/src/3rdParty/efsw/WatcherGeneric.cpp
diff --git a/src/3rdParty/efsw/WatcherGeneric.hpp b/src/3rdParty/efsw/WatcherGeneric.hpp
index 9cf8365..d11ec20 100755..100644
--- a/src/3rdParty/efsw/WatcherGeneric.hpp
+++ b/src/3rdParty/efsw/WatcherGeneric.hpp
@@ -17,7 +17,7 @@ class WatcherGeneric : public Watcher {
        ~WatcherGeneric();
-        void watch();
+        void watch() override;
        void watchDir( std::string dir );
diff --git a/src/3rdParty/efsw/WatcherInotify.cpp b/src/3rdParty/efsw/WatcherInotify.cpp
index 7259bb1..812ddae 100755..100644
--- a/src/3rdParty/efsw/WatcherInotify.cpp
+++ b/src/3rdParty/efsw/WatcherInotify.cpp
@@ -4,10 +4,6 @@ namespace efsw {
 WatcherInotify::WatcherInotify() : Watcher(), Parent( NULL ) {}
-WatcherInotify::WatcherInotify( WatchID id, std::string directory, FileWatchListener* listener,
-                                                                bool recursive, WatcherInotify* parent ) :
-        Watcher( id, directory, listener, recursive ), Parent( parent ), DirInfo( directory ) {}
 bool WatcherInotify::inParentTree( WatcherInotify* parent ) {
        WatcherInotify* tNext = Parent;
diff --git a/src/3rdParty/efsw/WatcherInotify.hpp b/src/3rdParty/efsw/WatcherInotify.hpp
index bf2ff5e..ec55ed0 100755..100644
--- a/src/3rdParty/efsw/WatcherInotify.hpp
+++ b/src/3rdParty/efsw/WatcherInotify.hpp
@@ -10,15 +10,13 @@ class WatcherInotify : public Watcher {
  public:
        WatcherInotify();
-        WatcherInotify( WatchID id, std::string directory, FileWatchListener* listener, bool recursive,
-                                        WatcherInotify* parent = NULL );
        bool inParentTree( WatcherInotify* parent );
        WatcherInotify* Parent;
        WatchID InotifyID;
        FileInfo DirInfo;
+        bool syntheticEvents{ false };
 };
 } // namespace efsw
diff --git a/src/3rdParty/efsw/WatcherKqueue.cpp b/src/3rdParty/efsw/WatcherKqueue.cpp
index 441948a..424b989 100755..100644
--- a/src/3rdParty/efsw/WatcherKqueue.cpp
+++ b/src/3rdParty/efsw/WatcherKqueue.cpp
@@ -139,7 +139,7 @@ void WatcherKqueue::addAll() {
 void WatcherKqueue::removeAll() {
        efDEBUG( "removeAll(): Removing all child watchers\n" );
-        std::list<WatchID> erase;
+        std::vector<WatchID> erase;
        for ( WatchMap::iterator it = mWatches.begin(); it != mWatches.end(); it++ ) {
                efDEBUG( "removeAll(): Removed child watcher %s\n", it->second->Directory.c_str() );
@@ -147,7 +147,7 @@ void WatcherKqueue::removeAll() {
                erase.push_back( it->second->ID );
        }
-        for ( std::list<WatchID>::iterator eit = erase.begin(); eit != erase.end(); eit++ ) {
+        for ( std::vector<WatchID>::iterator eit = erase.begin(); eit != erase.end(); eit++ ) {
                removeWatch( *eit );
        }
 }
@@ -354,7 +354,8 @@ void WatcherKqueue::watch() {
        bool needScan = false;
        // Then we get the the events of the current folder
-        while ( ( nev = kevent( mKqueue, &mChangeList[0], mChangeListCount + 1, &event, 1,
+        while ( !mChangeList.empty() &&
+                        ( nev = kevent( mKqueue, mChangeList.data(), mChangeListCount + 1, &event, 1,
                                                        &mWatcher->mTimeOut ) ) != 0 ) {
                // An error ocurred?
                if ( nev == -1 ) {
@@ -436,7 +437,6 @@ void WatcherKqueue::moveDirectory( std::string oldPath, std::string newPath, boo
 WatchID WatcherKqueue::addWatch( const std::string& directory, FileWatchListener* watcher,
                                                                 bool recursive, WatcherKqueue* parent ) {
-        static long s_fc = 0;
        static bool s_ug = false;
        std::string dir( directory );
@@ -478,8 +478,6 @@ WatchID WatcherKqueue::addWatch( const std::string& directory, FileWatchListener
                watch->addAll();
-                s_fc++;
                // if failed to open the directory... erase the watcher
                if ( !watch->initOK() ) {
                        int le = watch->lastErrno();
@@ -502,9 +500,8 @@ WatchID WatcherKqueue::addWatch( const std::string& directory, FileWatchListener
                }
        } else {
                if ( !s_ug ) {
-                        efDEBUG( "Started using WatcherGeneric, reached file descriptors limit: %ld. Folders "
+                        efDEBUG( "Started using WatcherGeneric, reached file descriptors limit: %ld.\n",
-                                         "added: %ld\n",
+                                         mWatcher->mFileDescriptorCount );
-                                         mWatcher->mFileDescriptorCount, s_fc );
                        s_ug = true;
                }
diff --git a/src/3rdParty/efsw/WatcherKqueue.hpp b/src/3rdParty/efsw/WatcherKqueue.hpp
index 87d898c..75c0f62 100755..100644
--- a/src/3rdParty/efsw/WatcherKqueue.hpp
+++ b/src/3rdParty/efsw/WatcherKqueue.hpp
@@ -49,7 +49,7 @@ class WatcherKqueue : public Watcher {
        WatchID watchingDirectory( std::string dir );
-        void watch();
+        void watch() override;
        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive,
                                          WatcherKqueue* parent );
diff --git a/src/3rdParty/efsw/WatcherWin32.cpp b/src/3rdParty/efsw/WatcherWin32.cpp
index 3e8bcc7..712419e 100755..100644
--- a/src/3rdParty/efsw/WatcherWin32.cpp
+++ b/src/3rdParty/efsw/WatcherWin32.cpp
@@ -1,34 +1,114 @@
+#include <efsw/Debug.hpp>
 #include <efsw/String.hpp>
 #include <efsw/WatcherWin32.hpp>
 #if EFSW_PLATFORM == EFSW_PLATFORM_WIN32
+#include <algorithm>
 namespace efsw {
-/// Unpacks events and passes them to a user defined callback.
+struct EFSW_FILE_NOTIFY_EXTENDED_INFORMATION_EX {
-void CALLBACK WatchCallback( DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped ) {
+        DWORD NextEntryOffset;
-        if ( dwNumberOfBytesTransfered == 0 || NULL == lpOverlapped ) {
+        DWORD Action;
-                return;
+        LARGE_INTEGER CreationTime;
+        LARGE_INTEGER LastModificationTime;
+        LARGE_INTEGER LastChangeTime;
+        LARGE_INTEGER LastAccessTime;
+        LARGE_INTEGER AllocatedLength;
+        LARGE_INTEGER FileSize;
+        DWORD FileAttributes;
+        DWORD ReparsePointTag;
+        LARGE_INTEGER FileId;
+        LARGE_INTEGER ParentFileId;
+        DWORD FileNameLength;
+        WCHAR FileName[1];
+};
+typedef EFSW_FILE_NOTIFY_EXTENDED_INFORMATION_EX* EFSW_PFILE_NOTIFY_EXTENDED_INFORMATION_EX;
+typedef BOOL( WINAPI* EFSW_LPREADDIRECTORYCHANGESEXW )( HANDLE hDirectory, LPVOID lpBuffer,
+                                                                                                   DWORD nBufferLength, BOOL bWatchSubtree,
+                                                                                                   DWORD dwNotifyFilter, LPDWORD lpBytesReturned,
+                                                                                                   LPOVERLAPPED lpOverlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
+                                                                                                   DWORD ReadDirectoryNotifyInformationClass );
+static EFSW_LPREADDIRECTORYCHANGESEXW pReadDirectoryChangesExW = NULL;
+#define EFSW_ReadDirectoryNotifyExtendedInformation 2
+static void initReadDirectoryChangesEx() {
+        static bool hasInit = false;
+        if ( !hasInit ) {
+                hasInit = true;
+                HMODULE hModule = GetModuleHandleW( L"Kernel32.dll" );
+                if ( !hModule )
+                        return;
+                pReadDirectoryChangesExW =
+                        (EFSW_LPREADDIRECTORYCHANGESEXW)GetProcAddress( hModule, "ReadDirectoryChangesExW" );
        }
+}
-        char szFile[MAX_PATH];
+void WatchCallbackOld( WatcherWin32* pWatch ) {
        PFILE_NOTIFY_INFORMATION pNotify;
-        WatcherStructWin32* tWatch = (WatcherStructWin32*)lpOverlapped;
-        WatcherWin32* pWatch = tWatch->Watch;
        size_t offset = 0;
        do {
                bool skip = false;
                pNotify = (PFILE_NOTIFY_INFORMATION)&pWatch->Buffer[offset];
                offset += pNotify->NextEntryOffset;
+                int count =
+                        WideCharToMultiByte( CP_UTF8, 0, pNotify->FileName,
+                                                                 pNotify->FileNameLength / sizeof( WCHAR ), NULL, 0, NULL, NULL );
+                if ( count == 0 )
+                        continue;
+                std::string nfile( count, '\0' );
+                count = WideCharToMultiByte( CP_UTF8, 0, pNotify->FileName,
+                                                                         pNotify->FileNameLength / sizeof( WCHAR ), &nfile[0], count,
+                                                                         NULL, NULL );
+                if ( FILE_ACTION_MODIFIED == pNotify->Action ) {
+                        FileInfo fifile( std::string( pWatch->DirName ) + nfile );
+                        if ( pWatch->LastModifiedEvent.file.ModificationTime == fifile.ModificationTime &&
+                                 pWatch->LastModifiedEvent.file.Size == fifile.Size &&
+                                 pWatch->LastModifiedEvent.fileName == nfile ) {
+                                skip = true;
+                        }
+                        pWatch->LastModifiedEvent.fileName = nfile;
+                        pWatch->LastModifiedEvent.file = fifile;
+                }
+                if ( !skip ) {
+                        pWatch->Watch->handleAction( pWatch, nfile, pNotify->Action );
+                }
+        } while ( pNotify->NextEntryOffset != 0 );
+}
+void WatchCallbackEx( WatcherWin32* pWatch ) {
+        EFSW_PFILE_NOTIFY_EXTENDED_INFORMATION_EX pNotify;
+        size_t offset = 0;
+        do {
+                bool skip = false;
+                pNotify = (EFSW_PFILE_NOTIFY_EXTENDED_INFORMATION_EX)&pWatch->Buffer[offset];
+                offset += pNotify->NextEntryOffset;
+                int count =
+                        WideCharToMultiByte( CP_UTF8, 0, pNotify->FileName,
+                                                                 pNotify->FileNameLength / sizeof( WCHAR ), NULL, 0, NULL, NULL );
+                if ( count == 0 )
+                        continue;
-                int count = WideCharToMultiByte( CP_UTF8, 0, pNotify->FileName,
+                std::string nfile( count, '\0' );
-                                                                                 pNotify->FileNameLength / sizeof( WCHAR ), szFile,
-                                                                                 MAX_PATH - 1, NULL, NULL );
-                szFile[count] = TEXT( '\0' );
-                std::string nfile( szFile );
+                count = WideCharToMultiByte( CP_UTF8, 0, pNotify->FileName,
+                                                                         pNotify->FileNameLength / sizeof( WCHAR ), &nfile[0], count,
+                                                                         NULL, NULL );
                if ( FILE_ACTION_MODIFIED == pNotify->Action ) {
                        FileInfo fifile( std::string( pWatch->DirName ) + nfile );
@@ -41,12 +121,59 @@ void CALLBACK WatchCallback( DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOve
                        pWatch->LastModifiedEvent.fileName = nfile;
                        pWatch->LastModifiedEvent.file = fifile;
+                } else if ( FILE_ACTION_RENAMED_OLD_NAME == pNotify->Action ) {
+                        pWatch->OldFiles.emplace_back( nfile, pNotify->FileId );
+                        skip = true;
+                } else if ( FILE_ACTION_RENAMED_NEW_NAME == pNotify->Action ) {
+                        std::string oldFile;
+                        LARGE_INTEGER oldFileId{};
+                        for ( auto it = pWatch->OldFiles.begin(); it != pWatch->OldFiles.end(); ++it ) {
+                                if ( it->second.QuadPart == pNotify->FileId.QuadPart ) {
+                                        oldFile = it->first;
+                                        oldFileId = it->second;
+                                        it = pWatch->OldFiles.erase( it );
+                                        break;
+                                }
+                        }
+                        if ( oldFile.empty() ) {
+                                pWatch->Watch->handleAction( pWatch, nfile, FILE_ACTION_ADDED );
+                                skip = true;
+                        } else {
+                                pWatch->Watch->handleAction( pWatch, oldFile, FILE_ACTION_RENAMED_OLD_NAME );
+                        }
                }
                if ( !skip ) {
                        pWatch->Watch->handleAction( pWatch, nfile, pNotify->Action );
                }
        } while ( pNotify->NextEntryOffset != 0 );
+}
+/// Unpacks events and passes them to a user defined callback.
+void CALLBACK WatchCallback( DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped ) {
+        if ( NULL == lpOverlapped ) {
+                return;
+        }
+        WatcherStructWin32* tWatch = (WatcherStructWin32*)lpOverlapped;
+        WatcherWin32* pWatch = tWatch->Watch;
+        if ( dwNumberOfBytesTransfered == 0 ) {
+                if ( nullptr != pWatch && !pWatch->StopNow ) {
+                        RefreshWatch( tWatch );
+                } else {
+                        return;
+                }
+        }
+        // Fork watch depending on the Windows API supported
+        if ( pWatch->Extended ) {
+                WatchCallbackEx( pWatch );
+        } else {
+                WatchCallbackOld( pWatch );
+        }
        if ( !pWatch->StopNow ) {
                RefreshWatch( tWatch );
@@ -54,11 +181,40 @@ void CALLBACK WatchCallback( DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOve
 }
 /// Refreshes the directory monitoring.
-bool RefreshWatch( WatcherStructWin32* pWatch ) {
+RefreshResult RefreshWatch( WatcherStructWin32* pWatch ) {
-        return ReadDirectoryChangesW( pWatch->Watch->DirHandle, pWatch->Watch->Buffer,
+        initReadDirectoryChangesEx();
-                                                                  sizeof( pWatch->Watch->Buffer ), pWatch->Watch->Recursive,
-                                                                  pWatch->Watch->NotifyFilter, NULL, &pWatch->Overlapped,
+        bool bRet = false;
-                                                                  NULL ) != 0;
+        RefreshResult ret = RefreshResult::Failed;
+        pWatch->Watch->Extended = false;
+        if ( pReadDirectoryChangesExW ) {
+                bRet = pReadDirectoryChangesExW( pWatch->Watch->DirHandle, pWatch->Watch->Buffer.data(),
+                                                                          (DWORD)pWatch->Watch->Buffer.size(), pWatch->Watch->Recursive,
+                                                                          pWatch->Watch->NotifyFilter, NULL, &pWatch->Overlapped,
+                                                                                 NULL, EFSW_ReadDirectoryNotifyExtendedInformation ) != 0;
+                if ( bRet ) {
+                        ret = RefreshResult::SucessEx;
+                        pWatch->Watch->Extended = true;
+                }
+        }
+        if ( !bRet ) {
+                bRet = ReadDirectoryChangesW( pWatch->Watch->DirHandle, pWatch->Watch->Buffer.data(),
+                                                                          (DWORD)pWatch->Watch->Buffer.size(), pWatch->Watch->Recursive,
+                                                                          pWatch->Watch->NotifyFilter, NULL, &pWatch->Overlapped,
+                                                                          NULL ) != 0;
+                if ( bRet )
+                        ret = RefreshResult::Success;
+        }
+        if ( !bRet ) {
+                std::string error = std::to_string( GetLastError() );
+                Errors::Log::createLastError( Errors::WatcherFailed, error );
+        }
+        return ret;
 }
 /// Stops monitoring a directory.
@@ -70,19 +226,17 @@ void DestroyWatch( WatcherStructWin32* pWatch ) {
                CloseHandle( pWatch->Watch->DirHandle );
                efSAFE_DELETE_ARRAY( pWatch->Watch->DirName );
                efSAFE_DELETE( pWatch->Watch );
+                efSAFE_DELETE( pWatch );
        }
 }
 /// Starts monitoring a directory.
-WatcherStructWin32* CreateWatch( LPCWSTR szDirectory, bool recursive, DWORD NotifyFilter,
+WatcherStructWin32* CreateWatch( LPCWSTR szDirectory, bool recursive,
-                                                                 HANDLE iocp ) {
+                                                                 DWORD bufferSize, DWORD notifyFilter, HANDLE iocp ) {
-        WatcherStructWin32* tWatch;
+        WatcherStructWin32* tWatch = new WatcherStructWin32();
-        size_t ptrsize = sizeof( *tWatch );
+        WatcherWin32* pWatch = new WatcherWin32(bufferSize);
-        tWatch = static_cast<WatcherStructWin32*>(
+        if (tWatch)
-                HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, ptrsize ) );
+                tWatch->Watch = pWatch;
-        WatcherWin32* pWatch = new WatcherWin32();
-        tWatch->Watch = pWatch;
        pWatch->DirHandle = CreateFileW(
                szDirectory, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
@@ -90,17 +244,17 @@ WatcherStructWin32* CreateWatch( LPCWSTR szDirectory, bool recursive, DWORD Noti
        if ( pWatch->DirHandle != INVALID_HANDLE_VALUE &&
                 CreateIoCompletionPort( pWatch->DirHandle, iocp, 0, 1 ) ) {
-                pWatch->NotifyFilter = NotifyFilter;
+                pWatch->NotifyFilter = notifyFilter;
                pWatch->Recursive = recursive;
-                if ( RefreshWatch( tWatch ) ) {
+                if ( RefreshResult::Failed != RefreshWatch( tWatch ) ) {
                        return tWatch;
                }
        }
        CloseHandle( pWatch->DirHandle );
        efSAFE_DELETE( pWatch->Watch );
-        HeapFree( GetProcessHeap(), 0, tWatch );
+        efSAFE_DELETE( tWatch );
        return NULL;
 }
diff --git a/src/3rdParty/efsw/WatcherWin32.hpp b/src/3rdParty/efsw/WatcherWin32.hpp
index 71e13be..ea1e8e4 100755..100644
--- a/src/3rdParty/efsw/WatcherWin32.hpp
+++ b/src/3rdParty/efsw/WatcherWin32.hpp
@@ -3,6 +3,7 @@
 #include <efsw/FileInfo.hpp>
 #include <efsw/FileWatcherImpl.hpp>
+#include <vector>
 #if EFSW_PLATFORM == EFSW_PLATFORM_WIN32
@@ -21,6 +22,8 @@ namespace efsw {
 class WatcherWin32;
+enum RefreshResult { Failed, Success, SucessEx };
 /// Internal watch data
 struct WatcherStructWin32 {
        OVERLAPPED Overlapped;
@@ -32,39 +35,41 @@ struct sLastModifiedEvent {
        std::string fileName;
 };
-bool RefreshWatch( WatcherStructWin32* pWatch );
+RefreshResult RefreshWatch( WatcherStructWin32* pWatch );
 void CALLBACK WatchCallback( DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped );
 void DestroyWatch( WatcherStructWin32* pWatch );
-WatcherStructWin32* CreateWatch( LPCWSTR szDirectory, bool recursive, DWORD NotifyFilter,
+WatcherStructWin32* CreateWatch( LPCWSTR szDirectory, bool recursive,
-                                                                 HANDLE iocp );
+                                                             DWORD bufferSize, DWORD notifyFilter, HANDLE iocp );
 class WatcherWin32 : public Watcher {
  public:
-        WatcherWin32() :
+        WatcherWin32(DWORD dwBufferSize) :
                Struct( NULL ),
                DirHandle( NULL ),
+                Buffer(),
                lParam( 0 ),
                NotifyFilter( 0 ),
                StopNow( false ),
+                Extended( false ),
                Watch( NULL ),
-                DirName( NULL ) {}
+                DirName( NULL ) {
+                        Buffer.resize(dwBufferSize);
+                }
        WatcherStructWin32* Struct;
        HANDLE DirHandle;
-        BYTE Buffer
+        std::vector<BYTE> Buffer;
-                [63 *
-                 1024]; // do NOT make this bigger than 64K because it will fail if the folder being watched
-                                // is on the network! (see
-                                // http://msdn.microsoft.com/en-us/library/windows/desktop/aa365465(v=vs.85).aspx)
        LPARAM lParam;
        DWORD NotifyFilter;
        bool StopNow;
+        bool Extended;
        FileWatcherImpl* Watch;
        char* DirName;
        sLastModifiedEvent LastModifiedEvent;
+        std::vector<std::pair<std::string, LARGE_INTEGER>> OldFiles;
 };
 } // namespace efsw
diff --git a/src/3rdParty/efsw/base.hpp b/src/3rdParty/efsw/base.hpp
index 43abc4f..43abc4f 100755..100644
--- a/src/3rdParty/efsw/base.hpp
+++ b/src/3rdParty/efsw/base.hpp
diff --git a/src/3rdParty/efsw/efsw.h b/src/3rdParty/efsw/efsw.h
index 28e63e2..30cf595 100755..100644
--- a/src/3rdParty/efsw/efsw.h
+++ b/src/3rdParty/efsw/efsw.h
@@ -1,7 +1,7 @@
 /**
        @author Sepul Sepehr Taghdisian
-        Copyright (c) 2013 Martin Lucas Golini
+        Copyright (c) 2024 Martín Lucas Golini
        Permission is hereby granted, free of charge, to any person obtaining a copy
        of this software and associated documentation files (the "Software"), to deal
@@ -32,31 +32,31 @@
 extern "C" {
 #endif
-#if defined(_WIN32)
+#if defined( _WIN32 )
-        #ifdef EFSW_DYNAMIC
+#ifdef EFSW_DYNAMIC
-                // Windows platforms
+// Windows platforms
-                #ifdef EFSW_EXPORTS
+#ifdef EFSW_EXPORTS
-                        // From DLL side, we must export
+// From DLL side, we must export
-                        #define EFSW_API __declspec(dllexport)
+#define EFSW_API __declspec( dllexport )
-                #else
-                        // From client application side, we must import
-                        #define EFSW_API __declspec(dllimport)
-                #endif
-        #else
-                // No specific directive needed for static build
-                #ifndef EFSW_API
-                #define EFSW_API
-                #endif
-        #endif
 #else
-        #if ( __GNUC__ >= 4 ) && defined( EFSW_EXPORTS )
+// From client application side, we must import
-                #define EFSW_API __attribute__ ((visibility("default")))
+#define EFSW_API __declspec( dllimport )
-        #endif
+#endif
+#else
-        // Other platforms don't need to define anything
+// No specific directive needed for static build
-        #ifndef EFSW_API
+#ifndef EFSW_API
-        #define EFSW_API
+#define EFSW_API
-        #endif
+#endif
+#endif
+#else
+#if ( __GNUC__ >= 4 ) && defined( EFSW_EXPORTS )
+#define EFSW_API __attribute__( ( visibility( "default" ) ) )
+#endif
+// Other platforms don't need to define anything
+#ifndef EFSW_API
+#define EFSW_API
+#endif
 #endif
 /// Type for a watch id
@@ -65,84 +65,127 @@ typedef long efsw_watchid;
 /// Type for watcher
 typedef void* efsw_watcher;
-enum efsw_action
+enum efsw_action {
-{
+        EFSW_ADD = 1,      /// Sent when a file is created or renamed
-        EFSW_ADD = 1,           /// Sent when a file is created or renamed
+        EFSW_DELETE = 2,   /// Sent when a file is deleted or renamed
-        EFSW_DELETE = 2,        /// Sent when a file is deleted or renamed
+        EFSW_MODIFIED = 3, /// Sent when a file is modified
-        EFSW_MODIFIED = 3,      /// Sent when a file is modified
+        EFSW_MOVED = 4     /// Sent when a file is moved
-        EFSW_MOVED = 4          /// Sent when a file is moved
+};
+enum efsw_error {
+        EFSW_NOTFOUND = -1,
+        EFSW_REPEATED = -2,
+        EFSW_OUTOFSCOPE = -3,
+        EFSW_NOTREADABLE = -4,
+        EFSW_REMOTE = -5,
+        EFSW_WATCHER_FAILED = -6,
+        EFSW_UNSPECIFIED = -7
 };
-enum efsw_error
+enum efsw_option {
-{
+        /// For Windows, the default buffer size of 63*1024 bytes sometimes is not enough and
-        EFSW_NOTFOUND           = -1,
+        /// file system events may be dropped. For that, using a different (bigger) buffer size
-        EFSW_REPEATED           = -2,
+        /// can be defined here, but note that this does not work for network drives,
-        EFSW_OUTOFSCOPE         = -3,
+        /// because a buffer larger than 64K will fail the folder being watched, see
-        EFSW_NOTREADABLE        = -4,
+        /// http://msdn.microsoft.com/en-us/library/windows/desktop/aa365465(v=vs.85).aspx)
-        EFSW_REMOTE                     = -5,
+        EFSW_OPT_WIN_BUFFER_SIZE = 1,
-        EFSW_UNSPECIFIED        = -6
+        /// For Windows, per default all events are captured but we might only be interested
+        /// in a subset; the value of the option should be set to a bitwise or'ed set of
+        /// FILE_NOTIFY_CHANGE_* flags.
+        EFSW_OPT_WIN_NOTIFY_FILTER = 2,
+        /// For macOS (FSEvents backend), per default all modified event types are capture but we might
+        // only be interested in a subset; the value of the option should be set to a set of bitwise
+        // from:
+        // kFSEventStreamEventFlagItemFinderInfoMod
+        // kFSEventStreamEventFlagItemModified
+        // kFSEventStreamEventFlagItemInodeMetaMod
+        // Default configuration will set the 3 flags
+        EFSW_OPT_MAC_MODIFIED_FILTER = 3,
+        /// macOS sometimes informs incorrect or old file states that may confuse the consumer
+        /// The events sanitizer will try to sanitize incorrectly reported events in favor of reducing
+        /// the number of events reported. This will have an small performance and memory impact as a
+        /// consequence.
+        EFSW_OPT_MAC_SANITIZE_EVENTS = 4,
+        /// Linux does not support natively recursive watchers. This means that when using recursive
+        /// watches efsw registers new watchers for each directory. If new file are created between
+        /// the time efsw takes to register the new directory those events might be missed. To avoid
+        /// missing new file notifications efsw will trigger synthetic new file events for existing
+        /// files in the new directroy watched. This might have the unintended consequence of sending
+        /// duplicated created events due to the system also emitting this event.
+        LINUX_PRODUCE_SYNTHETIC_EVENTS = 5,
 };
 /// Basic interface for listening for file events.
-typedef void (*efsw_pfn_fileaction_callback) (
+typedef void ( *efsw_pfn_fileaction_callback )( efsw_watcher watcher, efsw_watchid watchid,
-                efsw_watcher watcher,
+                                                                                                const char* dir, const char* filename,
-                efsw_watchid watchid,
+                                                                                                enum efsw_action action, const char* old_filename,
-                const char* dir,
+                                                                                                void* param );
-                const char* filename,
-                enum efsw_action action,
+typedef struct {
-                const char* old_filename,
+        enum efsw_option option;
-                void* param
+        int value;
-);
+} efsw_watcher_option;
 /**
 * Creates a new file-watcher
 * @param generic_mode Force the use of the Generic file watcher
 */
-efsw_watcher EFSW_API efsw_create(int generic_mode);
+efsw_watcher EFSW_API efsw_create( int generic_mode );
 /// Release the file-watcher and unwatch any directories
-void EFSW_API efsw_release(efsw_watcher watcher);
+void EFSW_API efsw_release( efsw_watcher watcher );
-/// Retreive last error occured by file-watcher
+/// Retrieve last error occured by file-watcher
 EFSW_API const char* efsw_getlasterror();
-/// Add a directory watch. Same as the other addWatch, but doesn't have recursive option.
+/// Reset file-watcher last error
-/// For backwards compatibility.
+EFSW_API void efsw_clearlasterror();
+/// Add a directory watch
 /// On error returns WatchID with Error type.
-efsw_watchid EFSW_API efsw_addwatch(efsw_watcher watcher, const char* directory, 
+efsw_watchid EFSW_API efsw_addwatch( efsw_watcher watcher, const char* directory,
-        efsw_pfn_fileaction_callback callback_fn, int recursive, void* param);
+                                                                         efsw_pfn_fileaction_callback callback_fn, int recursive,
+                                                                         void* param );
+/// Add a directory watch, specifying options
+/// @param options Pointer to an array of watcher options
+/// @param nr_options Number of options referenced by \p options
+efsw_watchid EFSW_API efsw_addwatch_withoptions( efsw_watcher watcher, const char* directory,
+                                                                                                 efsw_pfn_fileaction_callback callback_fn,
+                                                                                                 int recursive, efsw_watcher_option* options,
+                                                                                                 int options_number, void* param );
 /// Remove a directory watch. This is a brute force search O(nlogn).
-void EFSW_API efsw_removewatch(efsw_watcher watcher, const char* directory);
+void EFSW_API efsw_removewatch( efsw_watcher watcher, const char* directory );
 /// Remove a directory watch. This is a map lookup O(logn).
-void EFSW_API efsw_removewatch_byid(efsw_watcher watcher, efsw_watchid watchid);
+void EFSW_API efsw_removewatch_byid( efsw_watcher watcher, efsw_watchid watchid );
 /// Starts watching ( in other thread )
-void EFSW_API efsw_watch(efsw_watcher watcher);
+void EFSW_API efsw_watch( efsw_watcher watcher );
 /**
 * Allow recursive watchers to follow symbolic links to other directories
 * followSymlinks is disabled by default
 */
-void EFSW_API efsw_follow_symlinks(efsw_watcher watcher, int enable);
+void EFSW_API efsw_follow_symlinks( efsw_watcher watcher, int enable );
 /** @return If can follow symbolic links to directorioes */
-int EFSW_API efsw_follow_symlinks_isenabled(efsw_watcher watcher);
+int EFSW_API efsw_follow_symlinks_isenabled( efsw_watcher watcher );
 /**
 * When enable this it will allow symlinks to watch recursively out of the pointed directory.
 * follorSymlinks must be enabled to this work.
- * For example, added symlink to /home/folder, and the symlink points to /, this by default is not allowed,
+ * For example, added symlink to /home/folder, and the symlink points to /, this by default is not
- * it's only allowed to symlink anything from /home/ and deeper. This is to avoid great levels of recursion.
+ * allowed, it's only allowed to symlink anything from /home/ and deeper. This is to avoid great
- * Enabling this could lead in infinite recursion, and crash the watcher ( it will try not to avoid this ).
+ * levels of recursion. Enabling this could lead in infinite recursion, and crash the watcher ( it
- * Buy enabling out of scope links, it will allow this behavior.
+ * will try not to avoid this ). Buy enabling out of scope links, it will allow this behavior.
 * allowOutOfScopeLinks are disabled by default.
 */
-void EFSW_API efsw_allow_outofscopelinks(efsw_watcher watcher, int allow);
+void EFSW_API efsw_allow_outofscopelinks( efsw_watcher watcher, int allow );
 /// @return Returns if out of scope links are allowed
-int EFSW_API efsw_outofscopelinks_isallowed(efsw_watcher watcher);
+int EFSW_API efsw_outofscopelinks_isallowed( efsw_watcher watcher );
 #ifdef __cplusplus
 }
diff --git a/src/3rdParty/efsw/efsw.hpp b/src/3rdParty/efsw/efsw.hpp
index 12af116..11a5dec 100755..100644
--- a/src/3rdParty/efsw/efsw.hpp
+++ b/src/3rdParty/efsw/efsw.hpp
@@ -1,195 +1,261 @@
-/**
+/**
-        @author Martín Lucas Golini
+        @author Martín Lucas Golini
-        Copyright (c) 2013 Martín Lucas Golini
+        Copyright (c) 2024 Martín Lucas Golini
-        Permission is hereby granted, free of charge, to any person obtaining a copy
+        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
+        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
+        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
+        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
+        furnished to do so, subject to the following conditions:
-        The above copyright notice and this permission notice shall be included in
+        The above copyright notice and this permission notice shall be included in
-        all copies or substantial portions of the Software.
+        all copies or substantial portions of the Software.
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-        THE SOFTWARE.
+        THE SOFTWARE.
-        This software is a fork of the "simplefilewatcher" by James Wynn (james@jameswynn.com)
+        This software is a fork of the "simplefilewatcher" by James Wynn (james@jameswynn.com)
-        http://code.google.com/p/simplefilewatcher/ also MIT licensed.
+        http://code.google.com/p/simplefilewatcher/ also MIT licensed.
-*/
+*/
-#ifndef ESFW_HPP
+#ifndef ESFW_HPP
-#define ESFW_HPP
+#define ESFW_HPP
-#include <list>
+#include <string>
-#include <string>
+#include <vector>
-#if defined( _WIN32 )
+#if defined( _WIN32 )
-#ifdef EFSW_DYNAMIC
+#ifdef EFSW_DYNAMIC
-// Windows platforms
+// Windows platforms
-#ifdef EFSW_EXPORTS
+#ifdef EFSW_EXPORTS
-// From DLL side, we must export
+// From DLL side, we must export
-#define EFSW_API __declspec( dllexport )
+#define EFSW_API __declspec( dllexport )
-#else
+#else
-// From client application side, we must import
+// From client application side, we must import
-#define EFSW_API __declspec( dllimport )
+#define EFSW_API __declspec( dllimport )
-#endif
+#endif
-#else
+#else
-// No specific directive needed for static build
+// No specific directive needed for static build
-#ifndef EFSW_API
+#ifndef EFSW_API
-#define EFSW_API
+#define EFSW_API
-#endif
+#endif
-#endif
+#endif
-#else
+#else
-#if ( __GNUC__ >= 4 ) && defined( EFSW_EXPORTS )
+#if ( __GNUC__ >= 4 ) && defined( EFSW_EXPORTS )
-#ifndef EFSW_API
+#ifndef EFSW_API
-#define EFSW_API __attribute__( ( visibility( "default" ) ) )
+#define EFSW_API __attribute__( ( visibility( "default" ) ) )
-#endif
+#endif
-#endif
+#endif
-// Other platforms don't need to define anything
+// Other platforms don't need to define anything
-#ifndef EFSW_API
+#ifndef EFSW_API
-#define EFSW_API
+#define EFSW_API
-#endif
+#endif
-#endif
+#endif
-namespace efsw {
+namespace efsw {
-/// Type for a watch id
+/// Type for a watch id
-typedef long WatchID;
+typedef long WatchID;
-// forward declarations
+// forward declarations
-class FileWatcherImpl;
+class FileWatcherImpl;
-class FileWatchListener;
+class FileWatchListener;
+class WatcherOption;
-/// Actions to listen for. Rename will send two events, one for
-/// the deletion of the old file, and one for the creation of the
+/// Actions to listen for. Rename will send two events, one for
-/// new file.
+/// the deletion of the old file, and one for the creation of the
-namespace Actions {
+/// new file.
-enum Action {
+namespace Actions {
-        /// Sent when a file is created or renamed
+enum Action {
-        Add = 1,
+        /// Sent when a file is created or renamed
-        /// Sent when a file is deleted or renamed
+        Add = 1,
-        Delete = 2,
+        /// Sent when a file is deleted or renamed
-        /// Sent when a file is modified
+        Delete = 2,
-        Modified = 3,
+        /// Sent when a file is modified
-        /// Sent when a file is moved
+        Modified = 3,
-        Moved = 4
+        /// Sent when a file is moved
-};
+        Moved = 4
-}
+};
-typedef Actions::Action Action;
+}
+typedef Actions::Action Action;
-/// Errors log namespace
-namespace Errors {
+/// Errors log namespace
+namespace Errors {
-enum Error {
-        FileNotFound = -1,
+enum Error {
-        FileRepeated = -2,
+        NoError = 0,
-        FileOutOfScope = -3,
+        FileNotFound = -1,
-        FileNotReadable = -4,
+        FileRepeated = -2,
-        FileRemote = -5, /** Directory in remote file system ( create a generic FileWatcher instance to
+        FileOutOfScope = -3,
-                                                watch this directory ). */
+        FileNotReadable = -4,
-        Unspecified = -6
+        /// Directory in remote file system
-};
+        /// ( create a generic FileWatcher instance to watch this directory ).
+        FileRemote = -5,
-class EFSW_API Log {
+        /// File system watcher failed to watch for changes.
-  public:
+        WatcherFailed = -6,
-        /// @return The last error logged
+        Unspecified = -7
-        static std::string getLastErrorLog();
+};
-        /// Creates an error of the type specified
+class EFSW_API Log {
-        static Error createLastError( Error err, std::string log );
+  public:
-};
+        /// @return The last error logged
+        static std::string getLastErrorLog();
-} // namespace Errors
-typedef Errors::Error Error;
+        /// @return The code of the last error logged
+        static Error getLastErrorCode();
-/// Listens to files and directories and dispatches events
-/// to notify the listener of files and directories changes.
+        /// Reset last error
-/// @class FileWatcher
+        static void clearLastError();
-class EFSW_API FileWatcher {
-  public:
+        /// Creates an error of the type specified
-        /// Default constructor, will use the default platform file watcher
+        static Error createLastError( Error err, std::string log );
-        FileWatcher();
+};
-        /// Constructor that lets you force the use of the Generic File Watcher
+} // namespace Errors
-        explicit FileWatcher( bool useGenericFileWatcher );
+typedef Errors::Error Error;
-        virtual ~FileWatcher();
+/// Optional file watcher settings.
+namespace Options {
-        /// Add a directory watch. Same as the other addWatch, but doesn't have recursive option.
+enum Option {
-        /// For backwards compatibility.
+        /// For Windows, the default buffer size of 63*1024 bytes sometimes is not enough and
-        /// On error returns WatchID with Error type.
+        /// file system events may be dropped. For that, using a different (bigger) buffer size
-        WatchID addWatch( const std::string& directory, FileWatchListener* watcher );
+        /// can be defined here, but note that this does not work for network drives,
+        /// because a buffer larger than 64K will fail the folder being watched, see
-        /// Add a directory watch
+        /// http://msdn.microsoft.com/en-us/library/windows/desktop/aa365465(v=vs.85).aspx)
-        /// On error returns WatchID with Error type.
+        WinBufferSize = 1,
-        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive );
+        /// For Windows, per default all events are captured but we might only be interested
+        /// in a subset; the value of the option should be set to a bitwise or'ed set of
-        /// Remove a directory watch. This is a brute force search O(nlogn).
+        /// FILE_NOTIFY_CHANGE_* flags.
-        void removeWatch( const std::string& directory );
+        WinNotifyFilter = 2,
+        /// For macOS (FSEvents backend), per default all modified event types are capture but we might
-        /// Remove a directory watch. This is a map lookup O(logn).
+        /// only be interested in a subset; the value of the option should be set to a set of bitwise
-        void removeWatch( WatchID watchid );
+        /// from:
+        /// kFSEventStreamEventFlagItemFinderInfoMod
-        /// Starts watching ( in other thread )
+        /// kFSEventStreamEventFlagItemModified
-        void watch();
+        /// kFSEventStreamEventFlagItemInodeMetaMod
+        /// Default configuration will set the 3 flags
-        /// @return Returns a list of the directories that are being watched
+        MacModifiedFilter = 3,
-        std::list<std::string> directories();
+        /// macOS sometimes informs incorrect or old file states that may confuse the consumer
+        /// The events sanitizer will try to sanitize incorrectly reported events in favor of reducing
-        /** Allow recursive watchers to follow symbolic links to other directories
+        /// the number of events reported. This will have an small performance and memory impact as a
-         * followSymlinks is disabled by default
+        /// consequence.
-         */
+        MacSanitizeEvents = 4,
-        void followSymlinks( bool follow );
+        /// Linux does not support natively recursive watchers. This means that when using recursive
+        /// watches efsw registers new watchers for each directory. If new file are created between
-        /** @return If can follow symbolic links to directorioes */
+        /// the time efsw takes to register the new directory those events might be missed. To avoid
-        const bool& followSymlinks() const;
+        /// missing new file notifications efsw will trigger synthetic created file events for existing
+        /// files in the new directroy watched. This might have the unintended consequence of sending
-        /** When enable this it will allow symlinks to watch recursively out of the pointed directory.
+        /// duplicated created events due to the system also emitting this event.
-         * follorSymlinks must be enabled to this work.
+        LinuxProduceSyntheticEvents = 5,
-         * For example, added symlink to /home/folder, and the symlink points to /, this by default is
+};
-         * not allowed, it's only allowed to symlink anything from /home/ and deeper. This is to avoid
+}
-         * great levels of recursion. Enabling this could lead in infinite recursion, and crash the
+typedef Options::Option Option;
-         * watcher ( it will try not to avoid this ). Buy enabling out of scope links, it will allow
-         * this behavior. allowOutOfScopeLinks are disabled by default.
+/// Listens to files and directories and dispatches events
-         */
+/// to notify the listener of files and directories changes.
-        void allowOutOfScopeLinks( bool allow );
+/// @class FileWatcher
+class EFSW_API FileWatcher {
-        /// @return Returns if out of scope links are allowed
+  public:
-        const bool& allowOutOfScopeLinks() const;
+        /// Default constructor, will use the default platform file watcher
+        FileWatcher();
-  private:
-        /// The implementation
+        /// Constructor that lets you force the use of the Generic File Watcher
-        FileWatcherImpl* mImpl;
+        explicit FileWatcher( bool useGenericFileWatcher );
-        bool mFollowSymlinks;
-        bool mOutOfScopeLinks;
+        virtual ~FileWatcher();
-};
+        /// Add a directory watch. Same as the other addWatch, but doesn't have recursive option.
-/// Basic interface for listening for file events.
+        /// For backwards compatibility.
-/// @class FileWatchListener
+        /// On error returns WatchID with Error type.
-class FileWatchListener {
+        WatchID addWatch( const std::string& directory, FileWatchListener* watcher );
-  public:
-        virtual ~FileWatchListener() {}
+        /// Add a directory watch
+        /// On error returns WatchID with Error type.
-        /// Handles the action file action
+        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive );
-        /// @param watchid The watch id for the directory
-        /// @param dir The directory
+        /// Add a directory watch, allowing customization with options
-        /// @param filename The filename that was accessed (not full path)
+        /// @param directory The folder to be watched
-        /// @param action Action that was performed
+        /// @param watcher The listener to receive events
-        /// @param oldFilename The name of the file or directory moved
+        /// @param recursive Set this to true to include subdirectories
-        virtual void handleFileAction( WatchID watchid, const std::string& dir,
+        /// @param options Allows customization of a watcher
-                                                                   const std::string& filename, Action action,
+        /// @return Returns the watch id for the directory or, on error, a WatchID with Error type.
-                                                                   std::string oldFilename = "" ) = 0;
+        WatchID addWatch( const std::string& directory, FileWatchListener* watcher, bool recursive,
-};
+                                          const std::vector<WatcherOption>& options );
-} // namespace efsw
+        /// Remove a directory watch. This is a brute force search O(nlogn).
+        void removeWatch( const std::string& directory );
-#endif
+        /// Remove a directory watch. This is a map lookup O(logn).
+        void removeWatch( WatchID watchid );
+        /// Starts watching ( in other thread )
+        void watch();
+        /// @return Returns a list of the directories that are being watched
+        std::vector<std::string> directories();
+        /** Allow recursive watchers to follow symbolic links to other directories
+         * followSymlinks is disabled by default
+         */
+        void followSymlinks( bool follow );
+        /** @return If can follow symbolic links to directorioes */
+        const bool& followSymlinks() const;
+        /** When enable this it will allow symlinks to watch recursively out of the pointed directory.
+         * follorSymlinks must be enabled to this work.
+         * For example, added symlink to /home/folder, and the symlink points to /, this by default is
+         * not allowed, it's only allowed to symlink anything from /home/ and deeper. This is to avoid
+         * great levels of recursion. Enabling this could lead in infinite recursion, and crash the
+         * watcher ( it will try not to avoid this ). Buy enabling out of scope links, it will allow
+         * this behavior. allowOutOfScopeLinks are disabled by default.
+         */
+        void allowOutOfScopeLinks( bool allow );
+        /// @return Returns if out of scope links are allowed
+        const bool& allowOutOfScopeLinks() const;
+  private:
+        /// The implementation
+        FileWatcherImpl* mImpl;
+        bool mFollowSymlinks;
+        bool mOutOfScopeLinks;
+};
+/// Basic interface for listening for file events.
+/// @class FileWatchListener
+class FileWatchListener {
+  public:
+        virtual ~FileWatchListener() {}
+        /// Handles the action file action
+        /// @param watchid The watch id for the directory
+        /// @param dir The directory
+        /// @param filename The filename that was accessed (not full path)
+        /// @param action Action that was performed
+        /// @param oldFilename The name of the file or directory moved
+        virtual void handleFileAction( WatchID watchid, const std::string& dir,
+                                                                   const std::string& filename, Action action,
+                                                                   std::string oldFilename = "" ) = 0;
+};
+/// Optional, typically platform specific parameter for customization of a watcher.
+/// @class WatcherOption
+class WatcherOption {
+  public:
+        WatcherOption( Option option, int value ) : mOption( option ), mValue( value ){};
+        Option mOption;
+        int mValue;
+};
+} // namespace efsw
+#endif
diff --git a/src/3rdParty/efsw/inotify-nosys.h b/src/3rdParty/efsw/inotify-nosys.h
index be1e627..be1e627 100755..100644
--- a/src/3rdParty/efsw/inotify-nosys.h
+++ b/src/3rdParty/efsw/inotify-nosys.h
diff --git a/src/3rdParty/efsw/platform/platformimpl.hpp b/src/3rdParty/efsw/platform/platformimpl.hpp
index 5442580..5442580 100755..100644
--- a/src/3rdParty/efsw/platform/platformimpl.hpp
+++ b/src/3rdParty/efsw/platform/platformimpl.hpp
diff --git a/src/3rdParty/efsw/platform/posix/FileSystemImpl.cpp b/src/3rdParty/efsw/platform/posix/FileSystemImpl.cpp
index 92eeb47..92eeb47 100755..100644
--- a/src/3rdParty/efsw/platform/posix/FileSystemImpl.cpp
+++ b/src/3rdParty/efsw/platform/posix/FileSystemImpl.cpp
diff --git a/src/3rdParty/efsw/platform/posix/FileSystemImpl.hpp b/src/3rdParty/efsw/platform/posix/FileSystemImpl.hpp
index 0bfba76..0bfba76 100755..100644
--- a/src/3rdParty/efsw/platform/posix/FileSystemImpl.hpp
+++ b/src/3rdParty/efsw/platform/posix/FileSystemImpl.hpp
diff --git a/src/3rdParty/efsw/platform/posix/MutexImpl.cpp b/src/3rdParty/efsw/platform/posix/MutexImpl.cpp
index 2233798..2233798 100755..100644
--- a/src/3rdParty/efsw/platform/posix/MutexImpl.cpp
+++ b/src/3rdParty/efsw/platform/posix/MutexImpl.cpp
diff --git a/src/3rdParty/efsw/platform/posix/MutexImpl.hpp b/src/3rdParty/efsw/platform/posix/MutexImpl.hpp
index a33d827..a33d827 100755..100644
--- a/src/3rdParty/efsw/platform/posix/MutexImpl.hpp
+++ b/src/3rdParty/efsw/platform/posix/MutexImpl.hpp
diff --git a/src/3rdParty/efsw/platform/posix/SystemImpl.cpp b/src/3rdParty/efsw/platform/posix/SystemImpl.cpp
index 37d4120..37d4120 100755..100644
--- a/src/3rdParty/efsw/platform/posix/SystemImpl.cpp
+++ b/src/3rdParty/efsw/platform/posix/SystemImpl.cpp
diff --git a/src/3rdParty/efsw/platform/posix/SystemImpl.hpp b/src/3rdParty/efsw/platform/posix/SystemImpl.hpp
index 9322b06..9322b06 100755..100644
--- a/src/3rdParty/efsw/platform/posix/SystemImpl.hpp
+++ b/src/3rdParty/efsw/platform/posix/SystemImpl.hpp
diff --git a/src/3rdParty/efsw/platform/posix/ThreadImpl.cpp b/src/3rdParty/efsw/platform/posix/ThreadImpl.cpp
index e0ae84f..772fbc9 100755..100644
--- a/src/3rdParty/efsw/platform/posix/ThreadImpl.cpp
+++ b/src/3rdParty/efsw/platform/posix/ThreadImpl.cpp
@@ -5,11 +5,10 @@
 #include <cassert>
 #include <efsw/Debug.hpp>
-#include <iostream>
 namespace efsw { namespace Platform {
-ThreadImpl::ThreadImpl( Thread* owner ) : mIsActive( false ) {
+ThreadImpl::ThreadImpl( efsw::Thread* owner ) : mIsActive( false ) {
        mIsActive = pthread_create( &mThread, NULL, &ThreadImpl::entryPoint, owner ) == 0;
        if ( !mIsActive ) {
@@ -17,14 +16,16 @@ ThreadImpl::ThreadImpl( Thread* owner ) : mIsActive( false ) {
        }
 }
+ThreadImpl::~ThreadImpl() {
+        terminate();
+}
 void ThreadImpl::wait() {
        // Wait for the thread to finish, no timeout
        if ( mIsActive ) {
                assert( pthread_equal( pthread_self(), mThread ) == 0 );
-                pthread_join( mThread, NULL );
+                mIsActive = pthread_join( mThread, NULL ) != 0;
-                mIsActive = false; // Reset the thread state
        }
 }
@@ -41,14 +42,14 @@ void ThreadImpl::terminate() {
 }
 void* ThreadImpl::entryPoint( void* userData ) {
-        // The Thread instance is stored in the user data
-        Thread* owner = static_cast<Thread*>( userData );
 // Tell the thread to handle cancel requests immediatly
 #ifdef PTHREAD_CANCEL_ASYNCHRONOUS
        pthread_setcanceltype( PTHREAD_CANCEL_ASYNCHRONOUS, NULL );
 #endif
+        // The Thread instance is stored in the user data
+        Thread* owner = static_cast<Thread*>( userData );
        // Forward to the owner
        owner->run();
diff --git a/src/3rdParty/efsw/platform/posix/ThreadImpl.hpp b/src/3rdParty/efsw/platform/posix/ThreadImpl.hpp
index ffc6da0..2e02f9a 100755..100644
--- a/src/3rdParty/efsw/platform/posix/ThreadImpl.hpp
+++ b/src/3rdParty/efsw/platform/posix/ThreadImpl.hpp
@@ -5,6 +5,7 @@
 #if defined( EFSW_PLATFORM_POSIX )
+#include <efsw/Atomic.hpp>
 #include <pthread.h>
 namespace efsw {
@@ -15,7 +16,9 @@ namespace Platform {
 class ThreadImpl {
  public:
-        ThreadImpl( Thread* owner );
+        explicit ThreadImpl( efsw::Thread* owner );
+        ~ThreadImpl();
        void wait();
@@ -25,7 +28,7 @@ class ThreadImpl {
        static void* entryPoint( void* userData );
        pthread_t mThread;
-        bool mIsActive;
+        Atomic<bool> mIsActive;
 };
 } // namespace Platform
diff --git a/src/3rdParty/efsw/platform/win/FileSystemImpl.cpp b/src/3rdParty/efsw/platform/win/FileSystemImpl.cpp
index 2b87513..2b87513 100755..100644
--- a/src/3rdParty/efsw/platform/win/FileSystemImpl.cpp
+++ b/src/3rdParty/efsw/platform/win/FileSystemImpl.cpp
diff --git a/src/3rdParty/efsw/platform/win/FileSystemImpl.hpp b/src/3rdParty/efsw/platform/win/FileSystemImpl.hpp
index e952efc..e952efc 100755..100644
--- a/src/3rdParty/efsw/platform/win/FileSystemImpl.hpp
+++ b/src/3rdParty/efsw/platform/win/FileSystemImpl.hpp
diff --git a/src/3rdParty/efsw/platform/win/MutexImpl.cpp b/src/3rdParty/efsw/platform/win/MutexImpl.cpp
index 62b7f83..62b7f83 100755..100644
--- a/src/3rdParty/efsw/platform/win/MutexImpl.cpp
+++ b/src/3rdParty/efsw/platform/win/MutexImpl.cpp
diff --git a/src/3rdParty/efsw/platform/win/MutexImpl.hpp b/src/3rdParty/efsw/platform/win/MutexImpl.hpp
index 7b06492..7b06492 100755..100644
--- a/src/3rdParty/efsw/platform/win/MutexImpl.hpp
+++ b/src/3rdParty/efsw/platform/win/MutexImpl.hpp
diff --git a/src/3rdParty/efsw/platform/win/SystemImpl.cpp b/src/3rdParty/efsw/platform/win/SystemImpl.cpp
index d1f2b21..d1f2b21 100755..100644
--- a/src/3rdParty/efsw/platform/win/SystemImpl.cpp
+++ b/src/3rdParty/efsw/platform/win/SystemImpl.cpp
diff --git a/src/3rdParty/efsw/platform/win/SystemImpl.hpp b/src/3rdParty/efsw/platform/win/SystemImpl.hpp
index 99b4867..99b4867 100755..100644
--- a/src/3rdParty/efsw/platform/win/SystemImpl.hpp
+++ b/src/3rdParty/efsw/platform/win/SystemImpl.hpp
diff --git a/src/3rdParty/efsw/platform/win/ThreadImpl.cpp b/src/3rdParty/efsw/platform/win/ThreadImpl.cpp
index d0fde8b..463934c 100755..100644
--- a/src/3rdParty/efsw/platform/win/ThreadImpl.cpp
+++ b/src/3rdParty/efsw/platform/win/ThreadImpl.cpp
@@ -8,7 +8,7 @@
 namespace efsw { namespace Platform {
-ThreadImpl::ThreadImpl( Thread* owner ) {
+ThreadImpl::ThreadImpl( efsw::Thread* owner ) {
        mThread = reinterpret_cast<HANDLE>(
                _beginthreadex( NULL, 0, &ThreadImpl::entryPoint, owner, 0, &mThreadId ) );
diff --git a/src/3rdParty/efsw/platform/win/ThreadImpl.hpp b/src/3rdParty/efsw/platform/win/ThreadImpl.hpp
index 1afb593..455f24c 100755..100644
--- a/src/3rdParty/efsw/platform/win/ThreadImpl.hpp
+++ b/src/3rdParty/efsw/platform/win/ThreadImpl.hpp
@@ -19,7 +19,7 @@ namespace Platform {
 class ThreadImpl {
  public:
-        ThreadImpl( Thread* owner );
+        explicit ThreadImpl( efsw::Thread* owner );
        ~ThreadImpl();
diff --git a/src/3rdParty/efsw/sophist.h b/src/3rdParty/efsw/sophist.h
index 3a64504..82e5c36 100755..100644
--- a/src/3rdParty/efsw/sophist.h
+++ b/src/3rdParty/efsw/sophist.h
@@ -1,147 +1,147 @@
-/* sophist.h - 0.3 - public domain - Sean Barrett 2010
+/* sophist.h - 0.3 - public domain - Sean Barrett 2010
-** Knowledge drawn from Brian Hook's posh.h and http://predef.sourceforge.net
+** Knowledge drawn from Brian Hook's posh.h and http://predef.sourceforge.net
-** Sophist provides portable types; you typedef/#define them to your own names
+** Sophist provides portable types; you typedef/#define them to your own names
-**
+**
-** defines:
+** defines:
-**   - SOPHIST_endian    - either SOPHIST_little_endian or SOPHIST_big_endian
+**   - SOPHIST_endian    - either SOPHIST_little_endian or SOPHIST_big_endian
-**   - SOPHIST_has_64    - either 0 or 1; if 0, int64 types aren't defined
+**   - SOPHIST_has_64    - either 0 or 1; if 0, int64 types aren't defined
-**   - SOPHIST_pointer64 - either 0 or 1; if 1, pointer is 64-bit
+**   - SOPHIST_pointer64 - either 0 or 1; if 1, pointer is 64-bit
-**
+**
-**   - SOPHIST_intptr, SOPHIST_uintptr - integer same size as pointer
+**   - SOPHIST_intptr, SOPHIST_uintptr - integer same size as pointer
-**   - SOPHIST_int8,  SOPHIST_uint8,  SOPHIST_int16, SOPHIST_uint16
+**   - SOPHIST_int8,  SOPHIST_uint8,  SOPHIST_int16, SOPHIST_uint16
-**   - SOPHIST_int32, SOPHIST_uint32, SOPHIST_int64, SOPHIST_uint64
+**   - SOPHIST_int32, SOPHIST_uint32, SOPHIST_int64, SOPHIST_uint64
-**   - SOPHIST_int64_constant(number)      - macros for creating 64-bit
+**   - SOPHIST_int64_constant(number)      - macros for creating 64-bit
-**   - SOPHIST_uint64_constant(number)       integer constants
+**   - SOPHIST_uint64_constant(number)       integer constants
-**   - SOPHIST_printf_format64 - string for printf format for int64
+**   - SOPHIST_printf_format64 - string for printf format for int64
-*/
+*/
-#ifndef __INCLUDE_SOPHIST_H__
+#ifndef __INCLUDE_SOPHIST_H__
-#define __INCLUDE_SOPHIST_H__
+#define __INCLUDE_SOPHIST_H__
-#define SOPHIST_compiletime_assert(name,val) \
+#define SOPHIST_compiletime_assert(name,val) \
-            typedef int SOPHIST__assert##name[(val) ? 1 : -1]
+            typedef int SOPHIST__assert##name[(val) ? 1 : -1]
-/* define a couple synthetic rules to make code more readable */
+/* define a couple synthetic rules to make code more readable */
-#if (defined(__sparc__) || defined(__sparc)) && \
+#if (defined(__sparc__) || defined(__sparc)) && \
-    (defined(__arch64__) || defined(__sparcv9) || defined(__sparc_v9__))
+    (defined(__arch64__) || defined(__sparcv9) || defined(__sparc_v9__))
-  #define SOPHIST_sparc64
+  #define SOPHIST_sparc64
-#endif
+#endif
-#if (defined(linux) || defined(__linux__)) &&   \
+#if (defined(linux) || defined(__linux__)) &&   \
-    (defined(__alpha)||defined(__alpha__)||defined(__x86_64__)||defined(_M_X64))
+    (defined(__alpha)||defined(__alpha__)||defined(__x86_64__)||defined(_M_X64))
-  #define SOPHIST_linux64
+  #define SOPHIST_linux64
-#endif
+#endif
-/* basic types */
+/* basic types */
-typedef   signed  char SOPHIST_int8;
+typedef   signed  char SOPHIST_int8;
-typedef unsigned  char SOPHIST_uint8;
+typedef unsigned  char SOPHIST_uint8;
-typedef   signed short SOPHIST_int16;
+typedef   signed short SOPHIST_int16;
-typedef unsigned short SOPHIST_uint16;
+typedef unsigned short SOPHIST_uint16;
-#ifdef __palmos__
+#ifdef __palmos__
-  typedef   signed long SOPHIST_int32;
+  typedef   signed long SOPHIST_int32;
-  typedef unsigned long SOPHIST_uint32;
+  typedef unsigned long SOPHIST_uint32;
-#else
+#else
-  typedef   signed  int SOPHIST_int32;
+  typedef   signed  int SOPHIST_int32;
-  typedef unsigned  int SOPHIST_uint32;
+  typedef unsigned  int SOPHIST_uint32;
-#endif
+#endif
-#ifndef SOPHIST_NO_64
+#ifndef SOPHIST_NO_64
-   #if defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)     \
+   #if defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)     \
-       || (defined(__alpha) && defined(__DECC))
+       || (defined(__alpha) && defined(__DECC))
-     typedef   signed __int64 SOPHIST_int64;
+     typedef   signed __int64 SOPHIST_int64;
-     typedef unsigned __int64 SOPHIST_uint64;
+     typedef unsigned __int64 SOPHIST_uint64;
-     #define SOPHIST_has_64              1
+     #define SOPHIST_has_64              1
-     #define SOPHIST_int64_constant(x)   (x##i64)
+     #define SOPHIST_int64_constant(x)   (x##i64)
-     #define SOPHIST_uint64_constant(x)  (x##ui64)
+     #define SOPHIST_uint64_constant(x)  (x##ui64)
-     #define SOPHIST_printf_format64     "I64"
+     #define SOPHIST_printf_format64     "I64"
-   #elif defined(__LP64__) || defined(__powerpc64__) || defined(SOPHIST_sparc64)
+   #elif defined(__LP64__) || defined(__powerpc64__) || defined(SOPHIST_sparc64)
-     typedef   signed long    SOPHIST_int64;
+     typedef   signed long    SOPHIST_int64;
-     typedef unsigned long    SOPHIST_uint64;
+     typedef unsigned long    SOPHIST_uint64;
-     #define SOPHIST_has_64              1
+     #define SOPHIST_has_64              1
-     #define SOPHIST_int64_constant(x)   ((SOPHIST_int64) x)
+     #define SOPHIST_int64_constant(x)   ((SOPHIST_int64) x)
-     #define SOPHIST_uint64_constant(x)  ((SOPHIST_uint64) x)
+     #define SOPHIST_uint64_constant(x)  ((SOPHIST_uint64) x)
-     #define SOPHIST_printf_format64     "l"
+     #define SOPHIST_printf_format64     "l"
-   #elif defined(_LONG_LONG) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)  \
+   #elif defined(_LONG_LONG) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)  \
-       || defined(__GNUC__)  || defined(__MWERKS__) || defined(__APPLE_CC__) \
+       || defined(__GNUC__)  || defined(__MWERKS__) || defined(__APPLE_CC__) \
-       || defined(sgi)       || defined (__sgi)     || defined(__sgi__)      \
+       || defined(sgi)       || defined (__sgi)     || defined(__sgi__)      \
-       || defined(_CRAYC)
+       || defined(_CRAYC)
-     typedef   signed long long SOPHIST_int64;
+     typedef   signed long long SOPHIST_int64;
-     typedef unsigned long long SOPHIST_uint64;
+     typedef unsigned long long SOPHIST_uint64;
-     #define SOPHIST_has_64              1
+     #define SOPHIST_has_64              1
-     #define SOPHIST_int64_constant(x)   (x##LL)
+     #define SOPHIST_int64_constant(x)   (x##LL)
-     #define SOPHIST_uint64_constant(x)  (x##ULL)
+     #define SOPHIST_uint64_constant(x)  (x##ULL)
-     #define SOPHIST_printf_format64     "ll"
+     #define SOPHIST_printf_format64     "ll"
-   #endif
+   #endif
-#endif
+#endif
-#ifndef SOPHIST_has_64
+#ifndef SOPHIST_has_64
-#define SOPHIST_has_64 0
+#define SOPHIST_has_64 0
-#endif
+#endif
-SOPHIST_compiletime_assert( int8 , sizeof(SOPHIST_int8 ) == 1);
+SOPHIST_compiletime_assert( int8 , sizeof(SOPHIST_int8 ) == 1);
-SOPHIST_compiletime_assert(uint16, sizeof(SOPHIST_int16) == 2);
+SOPHIST_compiletime_assert(uint16, sizeof(SOPHIST_int16) == 2);
-SOPHIST_compiletime_assert( int32, sizeof(SOPHIST_int32 ) == 4);
+SOPHIST_compiletime_assert( int32, sizeof(SOPHIST_int32 ) == 4);
-SOPHIST_compiletime_assert(uint32, sizeof(SOPHIST_uint32) == 4);
+SOPHIST_compiletime_assert(uint32, sizeof(SOPHIST_uint32) == 4);
-#if SOPHIST_has_64
+#if SOPHIST_has_64
-  SOPHIST_compiletime_assert( int64, sizeof(SOPHIST_int64 ) == 8);
+  SOPHIST_compiletime_assert( int64, sizeof(SOPHIST_int64 ) == 8);
-  SOPHIST_compiletime_assert(uint64, sizeof(SOPHIST_uint64) == 8);
+  SOPHIST_compiletime_assert(uint64, sizeof(SOPHIST_uint64) == 8);
-#endif
+#endif
-/* determine whether pointers are 64-bit */
+/* determine whether pointers are 64-bit */
-#if    defined(SOPHIST_linux64) || defined(SOPHIST_sparc64)      \
+#if    defined(SOPHIST_linux64) || defined(SOPHIST_sparc64)      \
-    || defined(__osf__) || (defined(_WIN64) && !defined(_XBOX))  \
+    || defined(__osf__) || (defined(_WIN64) && !defined(_XBOX))  \
-    || defined(__64BIT__)                                        \
+    || defined(__64BIT__)                                        \
-    || defined(__LP64)  || defined(__LP64__) || defined(_LP64)   \
+    || defined(__LP64)  || defined(__LP64__) || defined(_LP64)   \
-    || defined(_ADDR64) || defined(_CRAYC)                       \
+    || defined(_ADDR64) || defined(_CRAYC)                       \
-  #define SOPHIST_pointer64 1
+  #define SOPHIST_pointer64 1
-  SOPHIST_compiletime_assert(pointer64, sizeof(void*) == 8);  
+  SOPHIST_compiletime_assert(pointer64, sizeof(void*) == 8);  
-  typedef SOPHIST_int64  SOPHIST_intptr;
+  typedef SOPHIST_int64  SOPHIST_intptr;
-  typedef SOPHIST_uint64 SOPHIST_uintptr;
+  typedef SOPHIST_uint64 SOPHIST_uintptr;
-#else
+#else
-  #define SOPHIST_pointer64 0
+  #define SOPHIST_pointer64 0
-  SOPHIST_compiletime_assert(pointer64, sizeof(void*) <= 4);  
+  SOPHIST_compiletime_assert(pointer64, sizeof(void*) <= 4);  
-  
+  
-  /* do we care about pointers that are only 16-bit? */
+  /* do we care about pointers that are only 16-bit? */
-  typedef SOPHIST_int32  SOPHIST_intptr;
+  typedef SOPHIST_int32  SOPHIST_intptr;
-  typedef SOPHIST_uint32 SOPHIST_uintptr;
+  typedef SOPHIST_uint32 SOPHIST_uintptr;
-#endif 
+#endif 
-SOPHIST_compiletime_assert(intptr, sizeof(SOPHIST_intptr) == sizeof(char *));
+SOPHIST_compiletime_assert(intptr, sizeof(SOPHIST_intptr) == sizeof(char *));
-/* enumerate known little endian cases; fallback to big-endian */
+/* enumerate known little endian cases; fallback to big-endian */
-#define SOPHIST_little_endian 1
+#define SOPHIST_little_endian 1
-#define SOPHIST_big_endian 2
+#define SOPHIST_big_endian 2
-#if    defined(__386__) || defined(i386)    || defined(__i386__)  \
+#if    defined(__386__) || defined(i386)    || defined(__i386__)  \
-    || defined(__X86)   || defined(_M_IX86)                       \
+    || defined(__X86)   || defined(_M_IX86)                       \
-    || defined(_M_X64)  || defined(__x86_64__)                    \
+    || defined(_M_X64)  || defined(__x86_64__)                    \
-    || defined(alpha)   || defined(__alpha) || defined(__alpha__) \
+    || defined(alpha)   || defined(__alpha) || defined(__alpha__) \
-    || defined(_M_ALPHA)                                          \
+    || defined(_M_ALPHA)                                          \
-    || defined(ARM)     || defined(_ARM)    || defined(__arm__)   \
+    || defined(ARM)     || defined(_ARM)    || defined(__arm__)   \
-    || defined(WIN32)   || defined(_WIN32)  || defined(__WIN32__) \
+    || defined(WIN32)   || defined(_WIN32)  || defined(__WIN32__) \
-    || defined(_WIN32_WCE) || defined(__NT__)                     \
+    || defined(_WIN32_WCE) || defined(__NT__)                     \
-    || defined(__MIPSEL__)
+    || defined(__MIPSEL__)
-  #define SOPHIST_endian  SOPHIST_little_endian
+  #define SOPHIST_endian  SOPHIST_little_endian
-#else
+#else
-  #define SOPHIST_endian  SOPHIST_big_endian
+  #define SOPHIST_endian  SOPHIST_big_endian
-#endif
+#endif
-#endif /* __INCLUDE_SOPHIST_H__ */
+#endif /* __INCLUDE_SOPHIST_H__ */
diff --git a/src/yuescript/yue_ast.h b/src/yuescript/yue_ast.h
index e670126..5e70645 100644
--- a/src/yuescript/yue_ast.h
+++ b/src/yuescript/yue_ast.h
@@ -620,6 +620,7 @@ AST_END(Slice)
 AST_NODE(Parens)
        ast_ptr<true, Exp_t> expr;
+        bool extra = false;
        AST_MEMBER(Parens, &expr)
 AST_END(Parens)
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index a2a1864..68ce9b5 100644
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -75,7 +75,7 @@ static std::unordered_set<std::string> Metamethods = {
        "close"s // Lua 5.4
 };
-const std::string_view version = "0.27.3"sv;
+const std::string_view version = "0.27.4"sv;
 const std::string_view extension = "yue"sv;
 class CompileError : public std::logic_error {
@@ -1080,8 +1080,8 @@ private:
                        if (unary->ops.empty()) {
                                Value_t* value = static_cast<Value_t*>(unary->expos.back());
                                if (auto chain = ast_cast<ChainValue_t>(value->item); chain && chain->items.size() == 1) {
-                                        if (auto exp = chain->get_by_path<Callable_t, Parens_t, Exp_t>()) {
+                                        if (auto parens = chain->get_by_path<Callable_t, Parens_t>(); parens && parens->extra) {
-                                                if (auto insideValue = singleValueFrom(exp)) {
+                                                if (auto insideValue = singleValueFrom(parens->expr)) {
                                                        return insideValue;
                                                }
                                        }
@@ -3262,6 +3262,7 @@ private:
                                                        } else if (destruct.items.size() == 1 && !singleValueFrom(*j)) {
                                                                auto p = destruct.value.get();
                                                                auto parens = p->new_ptr<Parens_t>();
+                                                                parens->extra = true;
                                                                if (auto tableBlock = ast_cast<TableBlock_t>(p)) {
                                                                        auto tableLit = p->new_ptr<TableLit_t>();
                                                                        tableLit->values.dup(tableBlock->values);
@@ -4750,6 +4751,7 @@ private:
                                newSimpleValue->value.set(funLit);
                                auto newExpInParens = newExp(newSimpleValue, x);
                                auto newParens = x->new_ptr<Parens_t>();
+                                newParens->extra = true;
                                newParens->expr.set(newExpInParens);
                                auto newCallable = x->new_ptr<Callable_t>();
                                newCallable->item.set(newParens);
@@ -5570,6 +5572,7 @@ private:
                auto x = chainList.front();
                if (ast_is<ExistentialOp_t>(chainList.back())) {
                        auto parens = x->new_ptr<Parens_t>();
+                        parens->extra = true;
                        {
                                auto chainValue = x->new_ptr<ChainValue_t>();
                                for (auto item : chainList) {
@@ -6163,6 +6166,7 @@ private:
                                                                ++next;
                                                                if (next != chainList.end()) {
                                                                        auto paren = x->new_ptr<Parens_t>();
+                                                                        paren->extra = true;
                                                                        paren->expr.set(newExp(chainValue, x));
                                                                        auto ncallable = x->new_ptr<Callable_t>();
                                                                        ncallable->item.set(paren);
@@ -6215,6 +6219,7 @@ private:
                                                        simpleValue->value.set(funLit);
                                                        auto exp = newExp(simpleValue, x);
                                                        auto paren = x->new_ptr<Parens_t>();
+                                                        paren->extra = true;
                                                        paren->expr.set(exp);
                                                        auto callable = x->new_ptr<Callable_t>();
                                                        callable->item.set(paren);
@@ -6631,6 +6636,7 @@ private:
                                        exp.set(info.node);
                                        if (!exp->opValues.empty() || (chainList.size() > 2 || (chainList.size() == 2 && !ast_is<Invoke_t, InvokeArgs_t>(chainList.back())))) {
                                                auto paren = x->new_ptr<Parens_t>();
+                                                paren->extra = true;
                                                paren->expr.set(exp);
                                                auto callable = x->new_ptr<Callable_t>();
                                                callable->item.set(paren);