Remove old msc ver. Freecad 0.20 require 64 bit and windows 7 or higher. For this reason, msc libraries less than 1800 will no longer be used. (#7036)
* remove msc<1800
This commit is contained in:
@@ -172,10 +172,7 @@ void Builder3D::addText(const Base::Vector3f &vec,const char * text, float color
|
|||||||
|
|
||||||
void Builder3D::clear ()
|
void Builder3D::clear ()
|
||||||
{
|
{
|
||||||
// Under VC6 string::clear() doesn't exist, under gcc stringstream::str() returns a copy not a reference
|
|
||||||
#if defined(_MSC_VER) && _MSC_VER >= 1400
|
|
||||||
result.str().clear();
|
result.str().clear();
|
||||||
#endif
|
|
||||||
result.clear();
|
result.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -122,19 +122,13 @@ MemDebug::MemDebug()
|
|||||||
// Open a log file for the hook functions to use
|
// Open a log file for the hook functions to use
|
||||||
if ( logFile != NULL )
|
if ( logFile != NULL )
|
||||||
throw std::runtime_error("Base::MemDebug::MemDebug():38: Don't call the constructor by your self!");
|
throw std::runtime_error("Base::MemDebug::MemDebug():38: Don't call the constructor by your self!");
|
||||||
#if (_MSC_VER >= 1400)
|
|
||||||
fopen_s( &logFile, "MemLog.txt", "w" );
|
fopen_s( &logFile, "MemLog.txt", "w" );
|
||||||
if ( logFile == NULL )
|
if ( logFile == NULL )
|
||||||
throw std::runtime_error("Base::MemDebug::MemDebug():41: File IO Error. Can't open log file...");
|
throw std::runtime_error("Base::MemDebug::MemDebug():41: File IO Error. Can't open log file...");
|
||||||
_strtime_s( timeStr, 15 );
|
_strtime_s( timeStr, 15 );
|
||||||
_strdate_s( dateStr, 15 );
|
_strdate_s( dateStr, 15 );
|
||||||
#elif (_MSC_VER >= 1200)
|
|
||||||
logFile = fopen( "MemLog.txt", "w" );
|
|
||||||
if ( logFile == NULL )
|
|
||||||
throw std::runtime_error("Base::MemDebug::MemDebug():41: File IO Error. Can't open log file...");
|
|
||||||
_strtime( timeStr );
|
|
||||||
_strdate( dateStr );
|
|
||||||
#endif
|
|
||||||
fprintf( logFile,
|
fprintf( logFile,
|
||||||
"Memory Allocation Log File for FreeCAD, run at %s on %s.\n",
|
"Memory Allocation Log File for FreeCAD, run at %s on %s.\n",
|
||||||
timeStr, dateStr );
|
timeStr, dateStr );
|
||||||
|
|||||||
@@ -94,135 +94,9 @@
|
|||||||
|
|
||||||
// If VC7 and later, then use the shipped 'dbghelp.h'-file
|
// If VC7 and later, then use the shipped 'dbghelp.h'-file
|
||||||
#pragma pack(push,8)
|
#pragma pack(push,8)
|
||||||
#if _MSC_VER >= 1300
|
|
||||||
#include <DbgHelp.h>
|
#include <DbgHelp.h>
|
||||||
#else
|
|
||||||
// inline the important dbghelp.h-declarations...
|
|
||||||
typedef enum {
|
|
||||||
SymNone = 0,
|
|
||||||
SymCoff,
|
|
||||||
SymCv,
|
|
||||||
SymPdb,
|
|
||||||
SymExport,
|
|
||||||
SymDeferred,
|
|
||||||
SymSym,
|
|
||||||
SymDia,
|
|
||||||
SymVirtual,
|
|
||||||
NumSymTypes
|
|
||||||
} SYM_TYPE;
|
|
||||||
typedef struct _IMAGEHLP_LINE64 {
|
|
||||||
DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_LINE64)
|
|
||||||
PVOID Key; // internal
|
|
||||||
DWORD LineNumber; // line number in file
|
|
||||||
PCHAR FileName; // full filename
|
|
||||||
DWORD64 Address; // first instruction of line
|
|
||||||
} IMAGEHLP_LINE64, *PIMAGEHLP_LINE64;
|
|
||||||
typedef struct _IMAGEHLP_MODULE64 {
|
|
||||||
DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_MODULE64)
|
|
||||||
DWORD64 BaseOfImage; // base load address of module
|
|
||||||
DWORD ImageSize; // virtual size of the loaded module
|
|
||||||
DWORD TimeDateStamp; // date/time stamp from pe header
|
|
||||||
DWORD CheckSum; // checksum from the pe header
|
|
||||||
DWORD NumSyms; // number of symbols in the symbol table
|
|
||||||
SYM_TYPE SymType; // type of symbols loaded
|
|
||||||
CHAR ModuleName[32]; // module name
|
|
||||||
CHAR ImageName[256]; // image name
|
|
||||||
CHAR LoadedImageName[256]; // symbol file name
|
|
||||||
} IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64;
|
|
||||||
typedef struct _IMAGEHLP_SYMBOL64 {
|
|
||||||
DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_SYMBOL64)
|
|
||||||
DWORD64 Address; // virtual address including dll base address
|
|
||||||
DWORD Size; // estimated size of symbol, can be zero
|
|
||||||
DWORD Flags; // info about the symbols, see the SYMF defines
|
|
||||||
DWORD MaxNameLength; // maximum size of symbol name in 'Name'
|
|
||||||
CHAR Name[1]; // symbol name (null terminated string)
|
|
||||||
} IMAGEHLP_SYMBOL64, *PIMAGEHLP_SYMBOL64;
|
|
||||||
typedef enum {
|
|
||||||
AddrMode1616,
|
|
||||||
AddrMode1632,
|
|
||||||
AddrModeReal,
|
|
||||||
AddrModeFlat
|
|
||||||
} ADDRESS_MODE;
|
|
||||||
typedef struct _tagADDRESS64 {
|
|
||||||
DWORD64 Offset;
|
|
||||||
WORD Segment;
|
|
||||||
ADDRESS_MODE Mode;
|
|
||||||
} ADDRESS64, *LPADDRESS64;
|
|
||||||
typedef struct _KDHELP64 {
|
|
||||||
DWORD64 Thread;
|
|
||||||
DWORD ThCallbackStack;
|
|
||||||
DWORD ThCallbackBStore;
|
|
||||||
DWORD NextCallback;
|
|
||||||
DWORD FramePointer;
|
|
||||||
DWORD64 KiCallUserMode;
|
|
||||||
DWORD64 KeUserCallbackDispatcher;
|
|
||||||
DWORD64 SystemRangeStart;
|
|
||||||
DWORD64 Reserved[8];
|
|
||||||
} KDHELP64, *PKDHELP64;
|
|
||||||
typedef struct _tagSTACKFRAME64 {
|
|
||||||
ADDRESS64 AddrPC; // program counter
|
|
||||||
ADDRESS64 AddrReturn; // return address
|
|
||||||
ADDRESS64 AddrFrame; // frame pointer
|
|
||||||
ADDRESS64 AddrStack; // stack pointer
|
|
||||||
ADDRESS64 AddrBStore; // backing store pointer
|
|
||||||
PVOID FuncTableEntry; // pointer to pdata/fpo or NULL
|
|
||||||
DWORD64 Params[4]; // possible arguments to the function
|
|
||||||
BOOL Far; // WOW far call
|
|
||||||
BOOL Virtual; // is this a virtual frame?
|
|
||||||
DWORD64 Reserved[3];
|
|
||||||
KDHELP64 KdHelp;
|
|
||||||
} STACKFRAME64, *LPSTACKFRAME64;
|
|
||||||
typedef
|
|
||||||
BOOL
|
|
||||||
(__stdcall *PREAD_PROCESS_MEMORY_ROUTINE64)(
|
|
||||||
HANDLE hProcess,
|
|
||||||
DWORD64 qwBaseAddress,
|
|
||||||
PVOID lpBuffer,
|
|
||||||
DWORD nSize,
|
|
||||||
LPDWORD lpNumberOfBytesRead
|
|
||||||
);
|
|
||||||
typedef
|
|
||||||
PVOID
|
|
||||||
(__stdcall *PFUNCTION_TABLE_ACCESS_ROUTINE64)(
|
|
||||||
HANDLE hProcess,
|
|
||||||
DWORD64 AddrBase
|
|
||||||
);
|
|
||||||
typedef
|
|
||||||
DWORD64
|
|
||||||
(__stdcall *PGET_MODULE_BASE_ROUTINE64)(
|
|
||||||
HANDLE hProcess,
|
|
||||||
DWORD64 Address
|
|
||||||
);
|
|
||||||
typedef
|
|
||||||
DWORD64
|
|
||||||
(__stdcall *PTRANSLATE_ADDRESS_ROUTINE64)(
|
|
||||||
HANDLE hProcess,
|
|
||||||
HANDLE hThread,
|
|
||||||
LPADDRESS64 lpaddr
|
|
||||||
);
|
|
||||||
#define SYMOPT_CASE_INSENSITIVE 0x00000001
|
|
||||||
#define SYMOPT_UNDNAME 0x00000002
|
|
||||||
#define SYMOPT_DEFERRED_LOADS 0x00000004
|
|
||||||
#define SYMOPT_NO_CPP 0x00000008
|
|
||||||
#define SYMOPT_LOAD_LINES 0x00000010
|
|
||||||
#define SYMOPT_OMAP_FIND_NEAREST 0x00000020
|
|
||||||
#define SYMOPT_LOAD_ANYTHING 0x00000040
|
|
||||||
#define SYMOPT_IGNORE_CVREC 0x00000080
|
|
||||||
#define SYMOPT_NO_UNQUALIFIED_LOADS 0x00000100
|
|
||||||
#define SYMOPT_FAIL_CRITICAL_ERRORS 0x00000200
|
|
||||||
#define SYMOPT_EXACT_SYMBOLS 0x00000400
|
|
||||||
#define SYMOPT_ALLOW_ABSOLUTE_SYMBOLS 0x00000800
|
|
||||||
#define SYMOPT_IGNORE_NT_SYMPATH 0x00001000
|
|
||||||
#define SYMOPT_INCLUDE_32BIT_MODULES 0x00002000
|
|
||||||
#define SYMOPT_PUBLICS_ONLY 0x00004000
|
|
||||||
#define SYMOPT_NO_PUBLICS 0x00008000
|
|
||||||
#define SYMOPT_AUTO_PUBLICS 0x00010000
|
|
||||||
#define SYMOPT_NO_IMAGE_SEARCH 0x00020000
|
|
||||||
#define SYMOPT_SECURE 0x00040000
|
|
||||||
#define SYMOPT_DEBUG 0x80000000
|
|
||||||
#define UNDNAME_COMPLETE (0x0000) // Enable full undecoration
|
|
||||||
#define UNDNAME_NAME_ONLY (0x1000) // Crack only the name for primary declaration;
|
|
||||||
#endif // _MSC_VER < 1300
|
|
||||||
#pragma pack(pop)
|
#pragma pack(pop)
|
||||||
|
|
||||||
// Some missing defines (for VC5/6):
|
// Some missing defines (for VC5/6):
|
||||||
@@ -231,15 +105,6 @@ DWORD64
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// secure-CRT_functions are only available starting with VC8
|
|
||||||
#if _MSC_VER < 1400
|
|
||||||
#define strcpy_s(dst, len, src) strcpy(dst, src)
|
|
||||||
#define strncpy_s(dst, len, src, maxLen) strncpy(dst, len, src)
|
|
||||||
#define strcat_s(dst, len, src) strcat(dst, src)
|
|
||||||
#define _snprintf_s _snprintf
|
|
||||||
#define _tcscat_s _tcscat
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void MyStrCpy(char* szDest, size_t nMaxDestSize, const char* szSrc)
|
static void MyStrCpy(char* szDest, size_t nMaxDestSize, const char* szSrc)
|
||||||
{
|
{
|
||||||
if (nMaxDestSize <= 0)
|
if (nMaxDestSize <= 0)
|
||||||
@@ -1349,7 +1214,6 @@ void StackWalker::OnSymInit(LPCSTR szSearchPath, DWORD symOptions, LPCSTR szUser
|
|||||||
ver.szCSDVersion, ver.wSuiteMask, ver.wProductType);
|
ver.szCSDVersion, ver.wSuiteMask, ver.wProductType);
|
||||||
OnOutput(buffer);
|
OnOutput(buffer);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void StackWalker::OnOutput(LPCSTR buffer)
|
void StackWalker::OnOutput(LPCSTR buffer)
|
||||||
|
|||||||
@@ -39,15 +39,6 @@
|
|||||||
#include <FCGlobal.h>
|
#include <FCGlobal.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// special defines for VC5/6 (if no actual PSDK is installed):
|
|
||||||
#if _MSC_VER < 1300
|
|
||||||
typedef unsigned __int64 DWORD64, *PDWORD64;
|
|
||||||
#if defined(_WIN64)
|
|
||||||
typedef unsigned __int64 SIZE_T, *PSIZE_T;
|
|
||||||
#else
|
|
||||||
typedef unsigned long SIZE_T, *PSIZE_T;
|
|
||||||
#endif
|
|
||||||
#endif // _MSC_VER < 1300
|
|
||||||
|
|
||||||
class StackWalkerInternal; // forward
|
class StackWalkerInternal; // forward
|
||||||
class BaseExport StackWalker
|
class BaseExport StackWalker
|
||||||
@@ -114,11 +105,6 @@ public:
|
|||||||
LPVOID pUserData = NULL // optional to identify some data in the 'readMemoryFunction'-callback
|
LPVOID pUserData = NULL // optional to identify some data in the 'readMemoryFunction'-callback
|
||||||
);
|
);
|
||||||
|
|
||||||
#if _MSC_VER >= 1300
|
|
||||||
// due to some reasons, the "STACKWALK_MAX_NAMELEN" must be declared as "public"
|
|
||||||
// in older compilers in order to use it... starting with VC7 we can declare it as "protected"
|
|
||||||
protected:
|
|
||||||
#endif
|
|
||||||
enum { STACKWALK_MAX_NAMELEN = 1024 }; // max name length for found symbols
|
enum { STACKWALK_MAX_NAMELEN = 1024 }; // max name length for found symbols
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@@ -170,9 +156,6 @@ protected:
|
|||||||
// So we just use the compiler-version (and assumes that the PSDK is
|
// So we just use the compiler-version (and assumes that the PSDK is
|
||||||
// the one which was installed by the VS-IDE)
|
// the one which was installed by the VS-IDE)
|
||||||
|
|
||||||
// INFO: If you want, you can use the RtlCaptureContext if you only target XP and later...
|
|
||||||
// But I currently use it in x64/IA64 environments...
|
|
||||||
//#if defined(_M_IX86) && (_WIN32_WINNT <= 0x0500) && (_MSC_VER < 1400)
|
|
||||||
|
|
||||||
#if defined(_M_IX86)
|
#if defined(_M_IX86)
|
||||||
#ifdef CURRENT_THREAD_VIA_EXCEPTION
|
#ifdef CURRENT_THREAD_VIA_EXCEPTION
|
||||||
|
|||||||
@@ -71,16 +71,11 @@
|
|||||||
// Which C++ standard is in use?
|
// Which C++ standard is in use?
|
||||||
//
|
//
|
||||||
#if defined( _MSC_VER )
|
#if defined( _MSC_VER )
|
||||||
# if _MSC_VER <= 1200
|
|
||||||
// MSVC++ 6.0
|
|
||||||
# define PYCXX_ISO_CPP_LIB 0
|
|
||||||
# define STR_STREAM <strstream>
|
|
||||||
# define TEMPLATE_TYPENAME class
|
|
||||||
# else
|
|
||||||
# define PYCXX_ISO_CPP_LIB 1
|
# define PYCXX_ISO_CPP_LIB 1
|
||||||
# define STR_STREAM <sstream>
|
# define STR_STREAM <sstream>
|
||||||
# define TEMPLATE_TYPENAME typename
|
# define TEMPLATE_TYPENAME typename
|
||||||
# endif
|
|
||||||
#elif defined( __GNUC__ )
|
#elif defined( __GNUC__ )
|
||||||
# if __GNUC__ >= 3
|
# if __GNUC__ >= 3
|
||||||
# define PYCXX_ISO_CPP_LIB 1
|
# define PYCXX_ISO_CPP_LIB 1
|
||||||
|
|||||||
@@ -160,11 +160,6 @@ int main( int argc, char ** argv )
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_MSC_VER) && _MSC_VER <= 1800
|
|
||||||
// See InterpreterSingleton::init
|
|
||||||
Redirection out(stdout), err(stderr), inp(stdin);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Name and Version of the Application
|
// Name and Version of the Application
|
||||||
App::Application::Config()["ExeName"] = "FreeCAD";
|
App::Application::Config()["ExeName"] = "FreeCAD";
|
||||||
App::Application::Config()["ExeVendor"] = "FreeCAD";
|
App::Application::Config()["ExeVendor"] = "FreeCAD";
|
||||||
|
|||||||
@@ -51,12 +51,7 @@ namespace bp = boost::placeholders;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if _MSC_VER <= 1700
|
|
||||||
// maybe in the c++ standard later, older compiler don't have round()
|
|
||||||
double round(double r) {
|
|
||||||
return (r > 0.0) ? floor(r + 0.5) : ceil(r - 0.5);
|
|
||||||
}
|
|
||||||
#endif // _MSC_VER < 1500
|
|
||||||
|
|
||||||
void pagesize(string & page_template, int dims[4], int block[4])
|
void pagesize(string & page_template, int dims[4], int block[4])
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -70,12 +70,7 @@
|
|||||||
|
|
||||||
using namespace Fem;
|
using namespace Fem;
|
||||||
|
|
||||||
// maybe in the c++ standard later, older compiler don't have round()
|
|
||||||
#if _MSC_VER <= 1700
|
|
||||||
double round(double r) {
|
|
||||||
return (r > 0.0) ? floor(r + 0.5) : ceil(r - 0.5);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if OCC_VERSION_HEX >= 0x070600
|
#if OCC_VERSION_HEX >= 0x070600
|
||||||
using Adaptor3d_HSurface = Adaptor3d_Surface;
|
using Adaptor3d_HSurface = Adaptor3d_Surface;
|
||||||
|
|||||||
@@ -60,15 +60,8 @@ typedef long long Integer64;
|
|||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
|
|
||||||
// Microsoft Visual C++ specific pragmas. MSVC6 is version 12.00, MSVC7.0 is
|
// Microsoft Visual C++ specific pragmas.
|
||||||
// version 13.00, and MSVC7.1 is version 13.10. MSVC8.0 is version 14.00.
|
#if _MSC_VER
|
||||||
#if _MSC_VER < 1300
|
|
||||||
#define WM4_USING_VC6
|
|
||||||
#elif _MSC_VER < 1310
|
|
||||||
#define WM4_USING_VC70
|
|
||||||
#elif _MSC_VER < 1400
|
|
||||||
#define WM4_USING_VC71
|
|
||||||
#else
|
|
||||||
#define WM4_USING_VC80
|
#define WM4_USING_VC80
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -28,9 +28,7 @@
|
|||||||
#if !defined(AFX_STDAFX_H__BA56C57E_75FC_4E34_A374_AEA259EB50FA__INCLUDED_)
|
#if !defined(AFX_STDAFX_H__BA56C57E_75FC_4E34_A374_AEA259EB50FA__INCLUDED_)
|
||||||
#define AFX_STDAFX_H__BA56C57E_75FC_4E34_A374_AEA259EB50FA__INCLUDED_
|
#define AFX_STDAFX_H__BA56C57E_75FC_4E34_A374_AEA259EB50FA__INCLUDED_
|
||||||
|
|
||||||
#if _MSC_VER > 1000
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#endif // _MSC_VER > 1000
|
|
||||||
|
|
||||||
// Disable warnings
|
// Disable warnings
|
||||||
#pragma warning(disable : 4996)
|
#pragma warning(disable : 4996)
|
||||||
|
|||||||
Reference in New Issue
Block a user