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

0022651: Impossible to build OCC as static library due to using Standard_EXPORT instead of Standard_API

Browse Source 
All library-specific macros for defining export / import properties of symbols on Windows (like Standard_API, __Draw_API, _math_API etc.) are eliminated.
Common macro Standard_EXPORT is used in all places where it is necessary.

New macro OCCT_STATIC_BUILD is defined for disabling Standard_EXPORT, to be used instead of HAVE_NO_DLL, though the latter is still supported as well (for compatibility).

To allow building OCCT in static mode on Windows after these changes:
- Files OSD_WNT_1.hxx and OSD_WNT_BREAK.hxx are removed; useful declarations are moved to OSD_WNT.hxx
- In the class IVtkVTK_ShapeData, static fields ARRNAME_MESH_TYPES and ARRNAME_SUBSHAPE_IDS are converted to static inline functions
- Global array ChoixRef defined in IntImp_ComputeTangence.cxx is converted to static function returning element of the array by index
- Unused class Quantity_Convert is removed (it had static field accessed by inline method)
- Struct Approx_Data defined in the same way in BRepApprox_Approx.hxx and GeomInt_WLApprox.hxx is made private member of these classes to avoid name clash
- Some C++ files producing no object code are removed
- In NCollection_EBTree.hxx and StdLPersistent_Collectio.hxx, definition of template virtual method is moved to class definition to avoid MSVC linker warnings on unused symbols
This commit is contained in:
abv
2018-03-15 13:07:48 +03:00
parent 8662560e2c
commit 68df847802
86 changed files with 465 additions and 1367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OSD/FILES
View File

@@ -91,5 +91,3 @@ OSD_Timer.hxx
OSD_WhoAmI.hxx
OSD_WNT.cxx
OSD_WNT.hxx
OSD_WNT_1.hxx
OSD_WNT_BREAK.hxx

2
src/OSD/OSD_Directory.cxx
View File

@@ -22,7 +22,7 @@
#include <NCollection_String.hxx>
#ifdef _WIN32
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#include <stdio.h>
#ifndef _INC_TCHAR

2
src/OSD/OSD_File.cxx
View File

@@ -29,7 +29,7 @@
#ifdef _WIN32
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#include <stdio.h>
#include <io.h>

2
src/OSD/OSD_FileNode.cxx
View File

@@ -373,7 +373,7 @@ Standard_Integer OSD_FileNode::Error()const{
#include <Standard_ProgramError.hxx>
#include <TCollection_ExtendedString.hxx>
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#ifndef _INC_TCHAR
# include <tchar.h>

8
src/OSD/OSD_OpenFile.hxx
View File

@@ -33,19 +33,19 @@
//! @param theName name of file encoded in UTF-16
//! @param theMode opening mode
//! @return file handle of opened file
__Standard_API FILE* OSD_OpenFile (const TCollection_ExtendedString& theName,
Standard_EXPORT FILE* OSD_OpenFile (const TCollection_ExtendedString& theName,
const char* theMode);
//! Function retrieves file timestamp.
//! @param theName name of file encoded in UTF-8
//! @return stat.st_ctime value
__Standard_API Standard_Time OSD_FileStatCTime (const char* theName);
Standard_EXPORT Standard_Time OSD_FileStatCTime (const char* theName);
//! Open file descriptor for specified UTF-16 file path.
//! @param theName name of file encoded in UTF-16
//! @param theMode opening mode
//! @return file descriptor on success or -1 on error
__Standard_API int OSD_OpenFileDescriptor (const TCollection_ExtendedString& theName,
Standard_EXPORT int OSD_OpenFileDescriptor (const TCollection_ExtendedString& theName,
::std::ios_base::openmode theMode);
//! Function opens the file buffer.
@@ -141,7 +141,7 @@ extern "C" {
//! @param theName name of file encoded in UTF-8
//! @param theMode opening mode
//! @return file handle of opened file
__Standard_API FILE* OSD_OpenFile (const char* theName, const char* theMode);
Standard_EXPORT FILE* OSD_OpenFile (const char* theName, const char* theMode);
#if defined(__cplusplus)
}

2
src/OSD/OSD_Process.cxx
View File

@@ -181,7 +181,7 @@ Standard_Integer OSD_Process::Error()const{
#include <Standard_PExtCharacter.hxx>
#include <TCollection_ExtendedString.hxx>
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#include <LMCONS.H> // for UNLEN - maximum user name length GetUserName()
void _osd_wnt_set_error ( OSD_Error&, OSD_WhoAmI, ... );

2
src/OSD/OSD_WNT.cxx
View File

@@ -21,7 +21,7 @@
/* ones ) and other convinient functions. */
/******************************************************************************/
/***/
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#include <Strsafe.h>
#include <wchar.h>

111
src/OSD/OSD_WNT.hxx
View File

@@ -12,21 +12,102 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef __OSD_WNT_HXX
# define __OSD_WNT_HXX
#ifndef __OSD_WNT_H
# define __OSD_WNT_H
#include <Standard_Stream.hxx>
# ifndef STRICT
# define STRICT
# endif /* STRICT */
# ifndef OSDAPI
# if !defined(HAVE_NO_DLL)
# ifdef __OSD_DLL
# define OSDAPI __declspec( dllexport )
# else
# define OSDAPI __declspec( dllimport )
# endif // __OSD_DLL
# else
# define OSDAPI
# endif
# endif // OSDAPI
# ifndef _INC_WINDOWS
# include <windows.h>
# endif /* _INC_WINDOWS */
#endif // __OSD_WNT_HXX
# ifdef __cplusplus
extern "C" {
# endif /* __cplusplus */
enum DIR_RESPONSE { DIR_ABORT, DIR_RETRY, DIR_IGNORE };
#define FLAG_READ_PIPE 0x00000001
#define FLAG_EOF 0x00000002
#define FLAG_FILE 0x00000004
#define FLAG_DIRECTORY 0x00000008
#define FLAG_PIPE 0x00000010
#define FLAG_SOCKET 0x00000020
#define FLAG_NAMED_PIPE 0x00000040
#define FLAG_DEVICE 0x00000080
#define FLAG_TYPE 0x0000007C
// 2 macros modified for VisualAge
//#define LODWORD( a ) ( DWORD )( ( ( DWORDLONG )( a ) ) & 0x00000000FFFFFFFF )
//#define HIDWORD( a ) ( DWORD )( ( ( DWORDLONG )( a ) ) >> 32 )
#define LODWORD( a ) ( DWORD )( ( ( _int64 )( a ) ) & 0x00000000FFFFFFFF )
#define HIDWORD( a ) ( DWORD )( ( ( _int64 )( a ) ) >> 32 )
typedef struct _file_ace {
ACE_HEADER header;
DWORD dwMask;
PSID pSID;
} FILE_ACE, *PFILE_ACE;
typedef void ( *MOVE_DIR_PROC ) ( LPCWSTR, LPCWSTR );
typedef void ( *COPY_DIR_PROC ) ( LPCWSTR, LPCWSTR );
typedef void ( *DELETE_DIR_PROC ) ( LPCWSTR );
typedef DIR_RESPONSE ( *RESPONSE_DIR_PROC ) ( LPCWSTR );
#define GET_SID( pACE ) ( ( PSID )( ( ( PBYTE )pACE ) + \
sizeof ( ACE_HEADER ) + \
sizeof ( DWORD ) \
) \
)
#define GET_MSK( pACE ) ( ( PDWORD )( ( ( PBYTE )pACE ) + \
sizeof ( ACE_HEADER ) \
) \
)
PSECURITY_DESCRIPTOR AllocSD ( void );
void FreeSD ( PSECURITY_DESCRIPTOR );
LPVOID GetTokenInformationEx ( HANDLE, TOKEN_INFORMATION_CLASS );
void FreeTokenInformation ( LPVOID );
PSECURITY_DESCRIPTOR GetFileSecurityEx ( LPCWSTR, SECURITY_INFORMATION );
void FreeFileSecurity ( PSECURITY_DESCRIPTOR );
PACL CreateAcl ( DWORD );
void FreeAcl ( PACL );
BOOL PredefinedSid ( PSID );
BOOL NtPredefinedSid ( PSID );
PSID AdminSid ( void );
PSID WorldSid ( void );
PSID InteractiveSid ( void );
PSID NetworkSid ( void );
PSID LocalSid ( void );
PSID DialupSid ( void );
PSID BatchSid ( void );
PSID CreatorOwnerSid ( void );
PSID NullSid ( void );
PSID NtSid ( void );
PVOID AllocAccessAllowedAce ( DWORD, BYTE, PSID );
void FreeAce ( PVOID );
BOOL MoveDirectory ( LPCWSTR, LPCWSTR );
BOOL CopyDirectory ( LPCWSTR, LPCWSTR );
void SetMoveDirectoryProc ( MOVE_DIR_PROC );
void SetCopyDirectoryProc ( COPY_DIR_PROC );
void SetResponseDirectoryProc ( RESPONSE_DIR_PROC );
# ifdef __cplusplus
}
# endif /* __cplusplus */
#endif /* __OSD_WNT_H */

125
src/OSD/OSD_WNT_1.hxx
View File

@@ -1,125 +0,0 @@
// Copyright (c) 1998-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef __OSD_WNT_H
# define __OSD_WNT_H
# ifndef STRICT
# define STRICT
# endif /* STRICT */
# ifndef _INC_WINDOWS
# include <windows.h>
# endif /* _INC_WINDOWS */
# ifndef OSDAPI
# if !defined(HAVE_NO_DLL)
# ifdef __OSD_DLL
# define OSDAPI __declspec( dllexport )
# else
# define OSDAPI __declspec( dllimport )
# endif /* OSD_DLL */
# else
# define OSDAPI
# endif
# endif /* OSDAPI */
# ifdef __cplusplus
extern "C" {
# endif /* __cplusplus */
enum DIR_RESPONSE { DIR_ABORT, DIR_RETRY, DIR_IGNORE };
#define FLAG_READ_PIPE 0x00000001
#define FLAG_EOF 0x00000002
#define FLAG_FILE 0x00000004
#define FLAG_DIRECTORY 0x00000008
#define FLAG_PIPE 0x00000010
#define FLAG_SOCKET 0x00000020
#define FLAG_NAMED_PIPE 0x00000040
#define FLAG_DEVICE 0x00000080
#define FLAG_TYPE 0x0000007C
// 2 macros modified for VisualAge
//#define LODWORD( a ) ( DWORD )( ( ( DWORDLONG )( a ) ) & 0x00000000FFFFFFFF )
//#define HIDWORD( a ) ( DWORD )( ( ( DWORDLONG )( a ) ) >> 32 )
#define LODWORD( a ) ( DWORD )( ( ( _int64 )( a ) ) & 0x00000000FFFFFFFF )
#define HIDWORD( a ) ( DWORD )( ( ( _int64 )( a ) ) >> 32 )
typedef struct _file_ace {
ACE_HEADER header;
DWORD dwMask;
PSID pSID;
} FILE_ACE, *PFILE_ACE;
typedef void ( *MOVE_DIR_PROC ) ( LPCWSTR, LPCWSTR );
typedef void ( *COPY_DIR_PROC ) ( LPCWSTR, LPCWSTR );
typedef void ( *DELETE_DIR_PROC ) ( LPCWSTR );
typedef DIR_RESPONSE ( *RESPONSE_DIR_PROC ) ( LPCWSTR );
#define GET_SID( pACE ) ( ( PSID )( ( ( PBYTE )pACE ) + \
sizeof ( ACE_HEADER ) + \
sizeof ( DWORD ) \
) \
)
#define GET_MSK( pACE ) ( ( PDWORD )( ( ( PBYTE )pACE ) + \
sizeof ( ACE_HEADER ) \
) \
)
PSECURITY_DESCRIPTOR OSDAPI AllocSD ( void );
void OSDAPI FreeSD ( PSECURITY_DESCRIPTOR );
LPVOID OSDAPI GetTokenInformationEx ( HANDLE, TOKEN_INFORMATION_CLASS );
void OSDAPI FreeTokenInformation ( LPVOID );
PSECURITY_DESCRIPTOR OSDAPI GetFileSecurityEx ( LPCWSTR, SECURITY_INFORMATION );
void OSDAPI FreeFileSecurity ( PSECURITY_DESCRIPTOR );
PACL OSDAPI CreateAcl ( DWORD );
void OSDAPI FreeAcl ( PACL );
BOOL OSDAPI PredefinedSid ( PSID );
BOOL OSDAPI NtPredefinedSid ( PSID );
PSID OSDAPI AdminSid ( void );
PSID OSDAPI WorldSid ( void );
PSID OSDAPI InteractiveSid ( void );
PSID OSDAPI NetworkSid ( void );
PSID OSDAPI LocalSid ( void );
PSID OSDAPI DialupSid ( void );
PSID OSDAPI BatchSid ( void );
PSID OSDAPI CreatorOwnerSid ( void );
PSID OSDAPI NullSid ( void );
PSID OSDAPI NtSid ( void );
PVOID OSDAPI AllocAccessAllowedAce ( DWORD, BYTE, PSID );
void OSDAPI FreeAce ( PVOID );
BOOL OSDAPI MoveDirectory ( LPCWSTR, LPCWSTR );
BOOL OSDAPI CopyDirectory ( LPCWSTR, LPCWSTR );
void OSDAPI SetMoveDirectoryProc ( MOVE_DIR_PROC );
void OSDAPI SetCopyDirectoryProc ( COPY_DIR_PROC );
void OSDAPI SetResponseDirectoryProc ( RESPONSE_DIR_PROC );
# ifdef __cplusplus
}
# endif /* __cplusplus */
#endif /* __OSD_WNT_H */

25
src/OSD/OSD_WNT_BREAK.hxx
View File

@@ -1,25 +0,0 @@
// Copyright (c) 1998-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef __OSD_WNT_BREAK_HXX
# define __OSD_WNT_BREAK_HXX
# ifdef _WIN32
# include <OSD.hxx>
# define _TSTBRK() OSD :: ControlBreak ()
# endif // _WIN32
#endif // __OSD_WNT_BREAK_HXX

2
src/OSD/OSD_signal.cxx
View File

@@ -53,7 +53,7 @@
#include <Standard_ProgramError.hxx>
#include <Standard_Mutex.hxx>
#include <OSD_WNT_1.hxx>
#include <OSD_WNT.hxx>
#ifdef _MSC_VER
#include <eh.h>