Reorder header file inclusion to avoid "byte" name collision.
When using the latest mingw64 header files, rpcndr.h (which is indiretly included by windows.h) defines a type named "byte" which collides with a definition in cpp_type_traits.h (included indirectly by the STL). This is only a problem if "using namespace std" is declared prior to including windows.h.
This commit is contained in:
parent
829d361b17
commit
4c4b09947f
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2019-2020 Martin Whitaker (icarus@martin-whitaker.me.uk)
|
||||
* Copyright (c) 2019-2021 Martin Whitaker (icarus@martin-whitaker.me.uk)
|
||||
*
|
||||
* This source code is free software; you can redistribute it
|
||||
* and/or modify it in source code form under the terms of the GNU
|
||||
|
|
@ -18,10 +18,10 @@
|
|||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "vvp/ivl_dlfcn.h"
|
||||
#include "compiler.h"
|
||||
#include "vpi_user.h"
|
||||
#include "sv_vpi_user.h"
|
||||
#include "vvp/ivl_dlfcn.h"
|
||||
|
||||
/* The only VPI routines that can be legally called when the functions in
|
||||
the vlog_startup_routines[] array are executed are vpi_register_systf()
|
||||
|
|
|
|||
Loading…
Reference in New Issue