ShaderModelRendererInternals is defined twice, once by ModelRenderer.cpp
and once by HWLightingModelRenderer.cpp. Having both in the global
namespace is a violation of the C++ One-Definition-Rule.
Move both definitions into their "parent" classes.
Details
Details
Building with LTO enabled finishes without warnings
Diff Detail
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Comment Actions
Hey thanks for the patch
Can you add context to the patch?
e.g.
svn diff -x -U5000
git diff -U5000
Or if you use arcanist see
Comment Actions
Upload with context.
I can actually compile with LTO anyways on clang, but this seems correct to me and it works.
Comment Actions
Indeed, there is the violation of ODR. The patch seems legit.
You need to add yourself in credits: binaries/data/mods/public/gui/credits/texts/programming.json if you're not there yet.
| source/renderer/HWLightingModelRenderer.h | ||
|---|---|---|
| 1 ↗ | (On Diff #13059) | The year should be updated when the file has been changed. |
| source/renderer/ModelRenderer.h | ||
| 1 ↗ | (On Diff #13059) | The same. |
Comment Actions
@StefanBruens Let me know if the credits are OK for you or if you want to appear differently. I'll commit then.
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues: Executing section Source... Project wide: **** CPPCheckBear (syntaxError) [Section: Source | Severity: MAJOR] **** ! ! Code 'classShaderModelVertexRenderer:' is invalid C code. Use --std or --language to configure the language. Project wide: **** CPPCheckBear (syntaxError) [Section: Source | Severity: MAJOR] **** ! ! Code 'classCModelRData:' is invalid C code. Use --std or --language to configure the language. Executing section JS... Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2907/display/redirect
| binaries/data/mods/public/gui/credits/texts/programming.json | ||
|---|---|---|
| 233 ↗ | (On Diff #13092) | The second one should be "name", otherwise looks fine. |
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues: Executing section Source... Project wide: **** CPPCheckBear (syntaxError) [Section: Source | Severity: MAJOR] **** ! ! Code 'classShaderModelVertexRenderer:' is invalid C code. Use --std or --language to configure the language. Project wide: **** CPPCheckBear (syntaxError) [Section: Source | Severity: MAJOR] **** ! ! Code 'classCModelRData:' is invalid C code. Use --std or --language to configure the language. Executing section JS... Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2913/display/redirect