From 08ae855e07e91e4373d28f2fee863193895aa916 Mon Sep 17 00:00:00 2001 From: sephiroth99 Date: Tue, 22 Sep 2015 03:02:06 -0400 Subject: [PATCH] It seems 'export' is a reserved keyword for clang. --- src/xenia/cpu/export_resolver.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/xenia/cpu/export_resolver.cc b/src/xenia/cpu/export_resolver.cc index 729756ecf..68028e7a2 100644 --- a/src/xenia/cpu/export_resolver.cc +++ b/src/xenia/cpu/export_resolver.cc @@ -28,9 +28,9 @@ ExportResolver::Table::Table(const char* module_name, exports_by_name_.reserve(exports_by_ordinal_->size()); for (size_t i = 0; i < exports_by_ordinal_->size(); ++i) { - auto export = exports_by_ordinal_->at(i); - if (export) { - exports_by_name_.push_back(export); + auto export_entry = exports_by_ordinal_->at(i); + if (export_entry) { + exports_by_name_.push_back(export_entry); } } std::sort( @@ -48,9 +48,9 @@ void ExportResolver::RegisterTable( all_exports_by_name_.reserve(all_exports_by_name_.size() + exports->size()); for (size_t i = 0; i < exports->size(); ++i) { - auto export = exports->at(i); - if (export) { - all_exports_by_name_.push_back(export); + auto export_entry = exports->at(i); + if (export_entry) { + all_exports_by_name_.push_back(export_entry); } } std::sort(