Merge branch 'master' into dev-2

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Donot rewrite original addr table file in addrDir when the base record is none
当记录为空时不覆写addrDir目录中的原始基址表文件

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
reset the conjunction
重新设置连接符

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Fix vs2010 bugs, using shared_ptr
修正vs2010中错误，使用shared_ptr

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Add __my_strlen function
添加__my_strlen函数

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
specialization const char* and const wchar_t*
特化const char*和const wchar_t*

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Only using string and not wstring
只使用string，不使用wstring

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Fix forward bug
修正转发时错误

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
move format_directory function
移动format_directory函数

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
sort out inline tag
整理inline标记

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
using default type char
使用默认类型char

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
format_directory support incoming a container type
format_directory支持传入容器

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
more strict string type judgment
更严格的string类型判断

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Update dumpImageSize version to 1.1.6.11
更新dumpImageSize版本到1.1.6.11

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Optimization is_string struct
优化is_string对象

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Update dumpImageSize version to 1.1.6.12
更新dumpImageSize版本到1.1.6.12

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>
Merge branch 'dev-2'

Signed-off-by: Wanpeng Song <swpustc@mail.ustc.edu.cn>