From 3d6498c7e7d4b53f6335556813a1cb5f6e26cb04 Mon Sep 17 00:00:00 2001 From: couriersud Date: Fri, 19 Jun 2015 21:05:10 +0200 Subject: [PATCH] Fix a clash (for_each) with c++ standard libraries. (nw) --- src/emu/sound/discrete.c | 3 ++- src/emu/sound/discrete.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c index 61f3ea35242..5270f37ebb9 100644 --- a/src/emu/sound/discrete.c +++ b/src/emu/sound/discrete.c @@ -39,7 +39,8 @@ #include "wavwrite.h" #include "discrete.h" - +/* for_each collides with c++ standard libraries - include it here */ +#define for_each(_T, _e, _l) for (_T _e = (_l)->begin_ptr() ; _e <= (_l)->end_ptr(); _e++) // device type definition const device_type DISCRETE = &device_creator; diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h index a7dff7c7ff7..d3dfd2c4e85 100644 --- a/src/emu/sound/discrete.h +++ b/src/emu/sound/discrete.h @@ -3747,8 +3747,6 @@ enum * *************************************/ -#define for_each(_T, _e, _l) for (_T _e = (_l)->begin_ptr() ; _e <= (_l)->end_ptr(); _e++) - /* * add and delete may be slow - the focus is on access! */