Merge branch 'master' of github.com:FreeCAD/FreeCAD

src/Mod/Draft/App/CMakeLists.txt

@@ -1,5 +1,5 @@
 if(MSVC)
-    add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH)
+    add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH -D_CRT_SECURE_NO_WARNINGS)
 else(MSVC)
     add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
 endif(MSVC)

src/Mod/Draft/App/PreCompiled.h

@@ -37,6 +37,10 @@
 # define BaseExport
 #endif
 
+#ifdef _MSC_VER
+# pragma warning(disable : 4275)
+#endif
+
 #ifdef _PreComp_
 
 // standard

src/Mod/Draft/App/dxf.cpp

@@ -1419,10 +1419,10 @@ void CDxfRead::get_line()
     m_ifs->getline(m_str, 1024);
 
     char str[1024];
-    int len = strlen(m_str);
+    size_t len = strlen(m_str);
     int j = 0;
     bool non_white_found = false;
-    for(int i = 0; i<len; i++){
+    for(size_t i = 0; i<len; i++){
         if(non_white_found || (m_str[i] != ' ' && m_str[i] != '\t')){
             if(m_str[i] != '\r')
             {