From 9c38c84c4840f5c4129494f713e89a7d82cb79e4 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 7 Apr 2016 07:54:52 +0200 Subject: Avoid reserved identifiers Change-Id: I438a7f28ba6bc68ec4e6244a4343e4040ab1b997 --- compilerplugins/clang/mergeclasses.results | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compilerplugins') diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 26695dbc540d..4678c11b4eaf 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -182,7 +182,7 @@ merge XclDebugObjCounter with XclRootData merge XclExpFutureRecord with XclExpChFutureRecordBase merge XclExpSubStream with XclExpChart merge XclNumFmtBuffer with XclImpNumFmtBuffer -merge _SdrItemBrowserWindow with SdrItemBrowser +merge SdrItemBrowserWindow with SdrItemBrowser merge _SfxMacroTabPage with SfxMacroTabPage merge abp::OModuleResourceClient with abp::OABSPilotUno merge accessibility::GridControlAccessibleElement with accessibility::AccessibleGridControlTableBase -- cgit