From 334739c9af0158813c6d0dea07d90d53a44cd0c0 Mon Sep 17 00:00:00 2001 From: Stefan Ring Date: Sat, 7 Aug 2010 21:54:50 +0200 Subject: [PATCH] * src/vm/os.hpp (call_scandir): Rename template arguments because of a namespace clash on s390. --- src/vm/os.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vm/os.hpp b/src/vm/os.hpp index 5e895d56c..752b76364 100644 --- a/src/vm/os.hpp +++ b/src/vm/os.hpp @@ -1,6 +1,6 @@ /* src/vm/os.hpp - system (OS) functions - Copyright (C) 2007, 2008, 2009 + Copyright (C) 2007, 2008, 2009, 2010 CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO Copyright (C) 2008 Theobroma Systems Ltd. @@ -187,8 +187,8 @@ public: static int processors_online(); // Template helper - template - static int call_scandir(int (*scandir)(const char *, struct dirent ***, F1, F2), const char *dir, struct dirent ***namelist, int(*filter)(const struct dirent *), int(*compar)(const void *, const void *)); + template + static int call_scandir(int (*scandir)(const char *, struct dirent ***, _F1, _F2), const char *dir, struct dirent ***namelist, int(*filter)(const struct dirent *), int(*compar)(const void *, const void *)); }; @@ -553,10 +553,10 @@ inline static void *system_realloc(void *ptr, size_t size) #endif } -template -inline int os::call_scandir(int (*scandir)(const char *, struct dirent ***, F1, F2), const char *dir, struct dirent ***namelist, int(*filter)(const struct dirent *), int(*compar)(const void *, const void *)) +template +inline int os::call_scandir(int (*scandir)(const char *, struct dirent ***, _F1, _F2), const char *dir, struct dirent ***namelist, int(*filter)(const struct dirent *), int(*compar)(const void *, const void *)) { - return scandir(dir, namelist, (F1) filter, (F2) compar); + return scandir(dir, namelist, (_F1) filter, (_F2) compar); } inline int os::scandir(const char *dir, struct dirent ***namelist, int(*filter)(const struct dirent *), int(*compar)(const void *, const void *)) -- 2.25.1