From 700fd60295c142ee2c1d01e3e53d6fdc1a44486b Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 17 Oct 2018 08:30:55 +0000 Subject: [PATCH] Update coding style to correctly ignore SGCT inline files in apps folder Update ghoul repository --- ext/ghoul | 2 +- include/openspace/interaction/shortcutmanager.h | 6 +++--- support/coding/check_style_guide.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/ghoul b/ext/ghoul index ea8b9659bd..e6e209531f 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit ea8b9659bdecce67f31143321db88ce0ee626ac0 +Subproject commit e6e209531fd10c56dcea54b9007852fe3d738771 diff --git a/include/openspace/interaction/shortcutmanager.h b/include/openspace/interaction/shortcutmanager.h index caab550807..35027cf3c1 100644 --- a/include/openspace/interaction/shortcutmanager.h +++ b/include/openspace/interaction/shortcutmanager.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __OPENSPACE_CORE___SHORTCUTSMANAGER___H__ -#define __OPENSPACE_CORE___SHORTCUTSMANAGER___H__ +#ifndef __OPENSPACE_CORE___SHORTCUTMANAGER___H__ +#define __OPENSPACE_CORE___SHORTCUTMANAGER___H__ #include #include @@ -56,4 +56,4 @@ private: } // namespace openspace::interaction -#endif // __OPENSPACE_CORE___SHORTCUTSMANAGER___H__ +#endif // __OPENSPACE_CORE___SHORTCUTMANAGER___H__ diff --git a/support/coding/check_style_guide.py b/support/coding/check_style_guide.py index 93b3e98e72..7914125588 100644 --- a/support/coding/check_style_guide.py +++ b/support/coding/check_style_guide.py @@ -633,7 +633,7 @@ check_files( ) check_files( [basePath + 'apps/**/*.inl'], - [basePath + 'apps/**/ext/**/*.h'], + [basePath + 'apps/**/ext/**/*.inl'], 'openspace_app', check_inline_file )