diff --git a/talk/base/latebindingsymboltable.cc.def b/talk/base/latebindingsymboltable.cc.def index 1f84f30fc5..64fc0dce2b 100644 --- a/talk/base/latebindingsymboltable.cc.def +++ b/talk/base/latebindingsymboltable.cc.def @@ -63,16 +63,17 @@ #error You must define LATE_BINDING_SYMBOL_TABLE_DLL_NAME #endif +#define X(sym) #sym, +const char* const LATE_BINDING_SYMBOL_TABLE_CLASS_NAME::kSymbolNames[] = { + LATE_BINDING_SYMBOL_TABLE_SYMBOLS_LIST +}; +#undef X + const ::talk_base::LateBindingSymbolTable::TableInfo LATE_BINDING_SYMBOL_TABLE_CLASS_NAME::kTableInfo = { LATE_BINDING_SYMBOL_TABLE_DLL_NAME, SYMBOL_TABLE_SIZE, - (const char *const []){ -#define X(sym) \ - #sym, -LATE_BINDING_SYMBOL_TABLE_SYMBOLS_LIST -#undef X - }, + LATE_BINDING_SYMBOL_TABLE_CLASS_NAME::kSymbolNames }; LATE_BINDING_SYMBOL_TABLE_CLASS_NAME::LATE_BINDING_SYMBOL_TABLE_CLASS_NAME() diff --git a/talk/base/latebindingsymboltable.h.def b/talk/base/latebindingsymboltable.h.def index cd8c176f36..3e1cdab599 100644 --- a/talk/base/latebindingsymboltable.h.def +++ b/talk/base/latebindingsymboltable.h.def @@ -89,6 +89,7 @@ LATE_BINDING_SYMBOL_TABLE_SYMBOLS_LIST }; static const ::talk_base::LateBindingSymbolTable::TableInfo kTableInfo; + static const char *const kSymbolNames[]; void *table_[SYMBOL_TABLE_SIZE];