OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0033404: Configuration - Building with Cotire failed on Clang-15

Browse Source 
Replaced old including of int defs from C standard into C++(11+) standard
This commit is contained in:
dpasukhi
2023-06-06 13:19:14 +00:00
parent 6aa053ae00
commit c975787c6c
5 changed files with 6 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ExpToCasExe/exptocas.lex
View File

@@ -86,9 +86,7 @@ int ec_error ( const std::string& s, const std::string& text )
%top{
// Pre-include stdlib.h to avoid redefinition of integer type macros (INT8_MIN and similar in generated code)
#if !defined(_MSC_VER) || (_MSC_VER >= 1600) // Visual Studio 2010+
#include "stdint.h"
#endif
#include <Standard_TypeDef.hxx>
}
%{

4
src/ExpToCasExe/lex.exptocas.cxx
View File

@@ -1,7 +1,5 @@
// Pre-include stdlib.h to avoid redefinition of integer type macros (INT8_MIN and similar in generated code)
#if !defined(_MSC_VER) || (_MSC_VER >= 1600) // Visual Studio 2010+
#include "stdint.h"
#endif
#include <Standard_TypeDef.hxx>
#define YY_INT_ALIGNED short int

37
src/Standard/Standard_TypeDef.hxx
View File

@@ -17,41 +17,8 @@
#include <cstddef>
#include <ctime>
#include <stdint.h>
#if(defined(_MSC_VER) && (_MSC_VER < 1800))
// only Visual Studio 2013 (vc12) provides <cinttypes> header
// we do not defined all macros here - only used by OCCT framework
#define PRIx64 "I64x"
#define PRIX64 "I64X"
#define PRId64 "I64d"
#define PRIu64 "I64u"
#define SCNd64 "I64d"
#define SCNu64 "I64u"
#ifdef _WIN64
#define PRIxPTR "I64x"
#define PRIXPTR "I64X"
#define PRIdPTR "I64d"
#define PRIuPTR "I64u"
#define SCNdPTR "I64d"
#define SCNuPTR "I64u"
#else
#define PRIxPTR "Ix"
#define PRIXPTR "IX"
#define PRIdPTR "d"
#define PRIuPTR "u"
#define SCNdPTR "d"
#define SCNuPTR "u"
#endif
#else
// should be just <cinttypes> since C++11
// however we use this code for compatibility with old C99 compilers
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#endif
#include <cstdint>
#include <cinttypes>
#define Standard_False false
#define Standard_True true

4
src/StepFile/lex.step.cxx
View File

@@ -2,9 +2,7 @@
// This file is generated, do not modify it directly; edit source file step.lex instead.
// Pre-include stdlib.h to avoid redefinition of integer type macros (INT8_MIN and similar in generated code)
#if !defined(_MSC_VER) || (_MSC_VER >= 1600) // Visual Studio 2010+
#include "stdint.h"
#endif
#include <Standard_TypeDef.hxx>
#define YY_INT_ALIGNED short int

4
src/StepFile/step.lex
View File

@@ -33,9 +33,7 @@
// This file is generated, do not modify it directly; edit source file step.lex instead.
// Pre-include stdlib.h to avoid redefinition of integer type macros (INT8_MIN and similar in generated code)
#if !defined(_MSC_VER) || (_MSC_VER >= 1600) // Visual Studio 2010+
#include "stdint.h"
#endif
#include <Standard_TypeDef.hxx>
}
%{