diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-07 07:54:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-07 07:57:12 +0200 |
| commit | 9c38c84c4840f5c4129494f713e89a7d82cb79e4 (patch) | |
| tree | 933e5d6fed2faae807d208b53336677f3a5268ad /compilerplugins | |
| parent | 641840dc0f63d23acceb7edd833f4a31f216009d (diff) | |
Avoid reserved identifiers
Change-Id: I438a7f28ba6bc68ec4e6244a4343e4040ab1b997
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 2 |
1 files changed, 1 insertions, 1 deletions
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 |