fix 4663.2 & higher waring level for thirdparty libraries

FarGroup · May 7, 2016 · 8a4a7b9 · 8a4a7b9
1 parent e425eff
commit 8a4a7b9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,4 +1,10 @@
-drkns 07.05.2016 17:45:49 +0200 - build 4663
+drkns 08.05.2016 01:12:06 +0200 - build 4664
+
+1. Уточнение 4663.2.
+
+2. Повысим уровень предупреждений для thirdparty-библиотек.
+
+drkns 07.05.2016 17:45:49 +0200 - build 4663
 
 1. Уточнение расчета общего индикатора удаления.
 

diff --git a/far/filelist.cpp b/far/filelist.cpp
@@ -975,7 +975,7 @@ __int64 FileList::VMProcess(int OpCode,void *vParam,__int64 iParam)
 			{
 				if (mps->Mode == 2)
 				{
-					split<decltype(itemsList)>(mps->Item->asString(), STLF_UNIQUE, L"\r\n");
+					itemsList = split<decltype(itemsList)>(mps->Item->asString(), STLF_UNIQUE, L"\r\n");
 					if (itemsList.empty())
 						return Result;
 				}

diff --git a/far/nsUniversalDetectorEx.cpp b/far/nsUniversalDetectorEx.cpp
@@ -38,10 +38,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace ucd
 {
-WARNING_PUSH(1)
+WARNING_PUSH(2)
 
 WARNING_DISABLE_GCC("-Wcast-qual")
-WARNING_DISABLE_GCC("-Wuseless-cast")
 WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant")
 WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
 

diff --git a/far/sqlite.c b/far/sqlite.c
@@ -33,20 +33,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "common/preprocessor.hpp"
 
-WARNING_PUSH(1)
-
-WARNING_DISABLE_MSC(4701) // https://msdn.microsoft.com/en-us/library/1wea5zwe.aspx Potentially uninitialized local variable 'name' used
-WARNING_DISABLE_MSC(4703) // https://msdn.microsoft.com/en-us/library/jj851030.aspx Potentially uninitialized local pointer variable 'name' used
+WARNING_PUSH(3)
 
 WARNING_DISABLE_GCC("-Warray-bounds")
-WARNING_DISABLE_GCC("-Wstrict-overflow")
-WARNING_DISABLE_GCC("-Wuninitialized")
 WARNING_DISABLE_GCC("-Wunused-but-set-variable")
-WARNING_DISABLE_GCC("-Wmaybe-uninitialized")
 WARNING_DISABLE_GCC("-Wcast-qual")
-WARNING_DISABLE_GCC("-Wsign-compare")
-WARNING_DISABLE_GCC("-Wshadow")
-
 
 #include "thirdparty/sqlite/sqlite3.c"
 

diff --git a/far/sqlite.hpp b/far/sqlite.hpp
@@ -33,7 +33,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace sqlite
 {
-WARNING_PUSH(1)
+WARNING_PUSH(3)
 
 WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant")
 

diff --git a/far/sqlite_unicode.c b/far/sqlite_unicode.c
@@ -36,7 +36,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define SQLITE_CORE
 #define SQLITE_ENABLE_UNICODE
 
-WARNING_PUSH(1)
+WARNING_PUSH(3)
 WARNING_DISABLE_GCC("-Wcast-qual")
 WARNING_DISABLE_GCC("-Wsequence-point")
 WARNING_DISABLE_GCC("-Wsign-compare")

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4663)m4_dnl
+m4_define(BUILD,4664)m4_dnl