Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Avoid conflict with Apple C++ runtime header nl_types.h

Browse Source
This commit is contained in:
Vas Crabb 2017-02-04 12:29:23 +11:00
parent 21b4a16edd
commit 4db6e43971
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/netlist/nl_types.h → src/lib/netlist/netlist_types.h
View File

@ -2,12 +2,12 @@
// copyright-holders:Couriersud // copyright-holders:Couriersud
/*! /*!
* *
* \file nl_types.h * \file netlist_types.h
* *
*/ */
#ifndef NLTYPES_H_ #ifndef NETLIST_TYPES_H_
#define NLTYPES_H_ #define NETLIST_TYPES_H_
#include <cstdint> #include <cstdint>
#include <unordered_map> #include <unordered_map>
@ -22,13 +22,13 @@ namespace netlist
// Performance tracking // Performance tracking
//============================================================ //============================================================
#if NL_KEEP_STATISTICS #if NL_KEEP_STATISTICS
using nperftime_t = plib::chrono::timer<plib::chrono::exact_ticks, true>; using nperftime_t = plib::chrono::timer<plib::chrono::exact_ticks, true>;
using nperfcount_t = plib::chrono::counter<true>; using nperfcount_t = plib::chrono::counter<true>;
#else #else
using nperftime_t = plib::chrono::timer<plib::chrono::exact_ticks, false>; using nperftime_t = plib::chrono::timer<plib::chrono::exact_ticks, false>;
using nperfcount_t = plib::chrono::counter<false>; using nperfcount_t = plib::chrono::counter<false>;
#endif #endif
//============================================================ //============================================================
// Types needed by various includes // Types needed by various includes
@ -51,4 +51,4 @@ namespace netlist
} }
} }
#endif /* NLTYPES_H_ */ #endif /* NETLIST_TYPES_H_ */

2
src/lib/netlist/nl_lists.h
View File

@ -15,7 +15,7 @@
#include <mutex> #include <mutex>
#include "nl_config.h" #include "nl_config.h"
#include "nl_types.h" #include "netlist_types.h"
#include "plib/plists.h" #include "plib/plists.h"
#include "plib/pchrono.h" #include "plib/pchrono.h"
#include "plib/ptypes.h" #include "plib/ptypes.h"

2
src/lib/netlist/nl_setup.h
View File

@ -15,7 +15,7 @@
#include "nl_factory.h" #include "nl_factory.h"
#include "nl_config.h" #include "nl_config.h"
#include "nl_types.h" #include "netlist_types.h"
#include <stack> #include <stack>
#include <vector> #include <vector>