luo980/stduuid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18 from kamrann/minor-fixes

Browse Source 
Minor changes to preprocessor directives
This commit is contained in:
Marius Bancila 2020-09-09 23:16:39 +03:00 committed by GitHub
commit 921f01fbea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/uuid.h
View File

@ -18,10 +18,13 @@
#include <gsl/span> #include <gsl/span>
#ifdef _WIN32 #ifdef _WIN32
#include <objbase.h> #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif
#include <objbase.h>
#include <windows.h> #include <windows.h>
#include <intrin.h> #include <intrin.h>
#include <iphlpapi.h> #include <iphlpapi.h>
@ -697,7 +700,7 @@ namespace uuids
bytes.byte15 bytes.byte15
} }; } };
return uuid{ std::begin(arrbytes), std::end(arrbytes) }; return uuid{ std::begin(arrbytes), std::end(arrbytes) };
#elif #else
return uuid{}; return uuid{};
#endif #endif
} }