Amebis/WinStd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add WINSTD_ prefix to some macro names

Browse Source 
This minimizes name collisions with other projects.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2022-01-27 09:47:58 +01:00
parent 9642f0d1d5
commit 7882064e0b
10 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/WinStd/COM.h
View File

@ -98,7 +98,7 @@ namespace winstd
template <class T>
class com_obj : public dplhandle<T*, NULL>
{
DPLHANDLE_IMPL(com_obj, NULL)
WINSTD_DPLHANDLE_IMPL(com_obj, NULL)
public:
///
@ -226,7 +226,7 @@ namespace winstd
///
class bstr : public dplhandle<BSTR, NULL>
{
DPLHANDLE_IMPL(bstr, NULL)
WINSTD_DPLHANDLE_IMPL(bstr, NULL)
public:
///

8
include/WinStd/Common.h
View File

@ -58,12 +58,12 @@
///
/// Stringizing macro helper
///
#define STRING_IMPL(x) #x
#define WINSTD_STRING_IMPL(x) #x
///
/// Stringizing macro
///
#define STRING(x) STRING_IMPL(x)
#define WINSTD_STRING(x) WINSTD_STRING_IMPL(x)
///
/// Declares a class as non-copyable
@ -126,7 +126,7 @@ private: \
///
/// Implements default constructors and operators to prevent their auto-generation by compiler.
///
#define HANDLE_IMPL(C, INVAL) \
#define WINSTD_HANDLE_IMPL(C, INVAL) \
public: \
inline C ( ) noexcept { } \
inline C (_In_opt_ handle_type h) noexcept : handle<handle_type, INVAL>( h ) { } \
@ -138,7 +138,7 @@ WINSTD_NONCOPYABLE(C)
///
/// Implements default constructors and operators to prevent their auto-generation by compiler.
///
#define DPLHANDLE_IMPL(C, INVAL) \
#define WINSTD_DPLHANDLE_IMPL(C, INVAL) \
public: \
inline C ( ) noexcept { } \
inline C (_In_opt_ handle_type h) noexcept : dplhandle<handle_type, INVAL>( h ) { } \

12
include/WinStd/Crypt.h
View File

@ -108,7 +108,7 @@ namespace winstd
///
class cert_context : public dplhandle<PCCERT_CONTEXT, NULL>
{
DPLHANDLE_IMPL(cert_context, NULL)
WINSTD_DPLHANDLE_IMPL(cert_context, NULL)
public:
///
@ -248,7 +248,7 @@ namespace winstd
///
class cert_chain_context : public dplhandle<PCCERT_CHAIN_CONTEXT, NULL>
{
DPLHANDLE_IMPL(cert_chain_context, NULL)
WINSTD_DPLHANDLE_IMPL(cert_chain_context, NULL)
public:
///
@ -303,7 +303,7 @@ namespace winstd
///
class cert_store : public handle<HCERTSTORE, NULL>
{
HANDLE_IMPL(cert_store, NULL)
WINSTD_HANDLE_IMPL(cert_store, NULL)
public:
///
@ -366,7 +366,7 @@ namespace winstd
///
class crypt_prov : public handle<HCRYPTPROV, NULL>
{
HANDLE_IMPL(crypt_prov, NULL)
WINSTD_HANDLE_IMPL(crypt_prov, NULL)
public:
///
@ -410,7 +410,7 @@ namespace winstd
///
class crypt_hash : public dplhandle<HCRYPTHASH, NULL>
{
DPLHANDLE_IMPL(crypt_hash, NULL)
WINSTD_DPLHANDLE_IMPL(crypt_hash, NULL)
public:
///
@ -465,7 +465,7 @@ namespace winstd
///
class crypt_key : public dplhandle<HCRYPTKEY, NULL>
{
DPLHANDLE_IMPL(crypt_key, NULL)
WINSTD_DPLHANDLE_IMPL(crypt_key, NULL)
public:
///

2
include/WinStd/EAP.h
View File

@ -388,7 +388,7 @@ namespace winstd
///
class eap_packet : public dplhandle<EapPacket*, NULL>
{
DPLHANDLE_IMPL(eap_packet, NULL)
WINSTD_DPLHANDLE_IMPL(eap_packet, NULL)
public:
///

4
include/WinStd/ETW.h
View File

@ -406,7 +406,7 @@ namespace winstd
///
class event_provider : public handle<REGHANDLE, NULL>
{
HANDLE_IMPL(event_provider, NULL)
WINSTD_HANDLE_IMPL(event_provider, NULL)
public:
///
@ -811,7 +811,7 @@ namespace winstd
///
class event_trace : public handle<TRACEHANDLE, INVALID_PROCESSTRACE_HANDLE>
{
HANDLE_IMPL(event_trace, INVALID_PROCESSTRACE_HANDLE)
WINSTD_HANDLE_IMPL(event_trace, INVALID_PROCESSTRACE_HANDLE)
public:
///

4
include/WinStd/GDI.h
View File

@ -33,7 +33,7 @@ namespace winstd
template<class T>
class gdi_handle : public handle<T, NULL>
{
HANDLE_IMPL(gdi_handle, NULL)
WINSTD_HANDLE_IMPL(gdi_handle, NULL)
public:
///
@ -65,7 +65,7 @@ namespace winstd
///
class dc : public handle<HDC, NULL>
{
HANDLE_IMPL(dc, NULL)
WINSTD_HANDLE_IMPL(dc, NULL)
public:
///

2
include/WinStd/SetupAPI.h
View File

@ -33,7 +33,7 @@ namespace winstd
///
class setup_device_info_list : public handle<HDEVINFO, INVALID_HANDLE_VALUE>
{
HANDLE_IMPL(setup_device_info_list, INVALID_HANDLE_VALUE)
WINSTD_HANDLE_IMPL(setup_device_info_list, INVALID_HANDLE_VALUE)
public:
///

2
include/WinStd/WLAN.h
View File

@ -112,7 +112,7 @@ namespace winstd
///
class wlan_handle : public handle<HANDLE, NULL>
{
HANDLE_IMPL(wlan_handle, NULL)
WINSTD_HANDLE_IMPL(wlan_handle, NULL)
public:
///

14
include/WinStd/Win.h
View File

@ -87,6 +87,7 @@ template<class _Elem, class _Traits, class _Ax> inline VOID GuidToStringA(_In_ L
/// \param[out] str String to store the result to
///
template<class _Elem, class _Traits, class _Ax> inline VOID GuidToStringW(_In_ LPCGUID lpGuid, _Out_ std::basic_string<_Elem, _Traits, _Ax> &str) noexcept;
/// @copydoc GuidToStringW()
#ifdef _UNICODE
#define GuidToString GuidToStringW
@ -109,6 +110,7 @@ _Success_(return) BOOL StringToGuidA(_In_z_ LPCSTR lpszGuid, _Out_ LPGUID lpGuid
/// - `FALSE` otherwise.
///
_Success_(return) BOOL StringToGuidW(_In_z_ LPCWSTR lpszGuid, _Out_ LPGUID lpGuid, _Out_opt_ LPCWSTR *lpszGuidEnd = NULL) noexcept;
/// @copydoc StringToGuidW()
#ifdef _UNICODE
#define StringToGuid StringToGuidW
@ -387,7 +389,7 @@ namespace winstd
template<HANDLE INVALID>
class win_handle : public handle<HANDLE, INVALID>
{
HANDLE_IMPL(win_handle, INVALID)
WINSTD_HANDLE_IMPL(win_handle, INVALID)
public:
///
@ -419,7 +421,7 @@ namespace winstd
///
class library : public handle<HMODULE, NULL>
{
HANDLE_IMPL(library, NULL)
WINSTD_HANDLE_IMPL(library, NULL)
public:
///
@ -601,7 +603,7 @@ namespace winstd
///
class find_file : public handle<HANDLE, INVALID_HANDLE_VALUE>
{
HANDLE_IMPL(find_file, INVALID_HANDLE_VALUE)
WINSTD_HANDLE_IMPL(find_file, INVALID_HANDLE_VALUE)
public:
///
@ -645,7 +647,7 @@ namespace winstd
///
class heap : public handle<HANDLE, NULL>
{
HANDLE_IMPL(heap, NULL)
WINSTD_HANDLE_IMPL(heap, NULL)
public:
///
@ -1018,7 +1020,7 @@ namespace winstd
///
class reg_key : public handle<HKEY, NULL>
{
HANDLE_IMPL(reg_key, NULL)
WINSTD_HANDLE_IMPL(reg_key, NULL)
public:
///
@ -1109,7 +1111,7 @@ namespace winstd
///
class security_id : public handle<PSID, NULL>
{
HANDLE_IMPL(security_id, NULL)
WINSTD_HANDLE_IMPL(security_id, NULL)
public:
///

2
include/WinStd/WinSock2.h
View File

@ -109,7 +109,7 @@ namespace winstd
///
class addrinfo : public handle<PADDRINFOT, NULL>
{
HANDLE_IMPL(addrinfo, NULL)
WINSTD_HANDLE_IMPL(addrinfo, NULL)
public:
///