From a0080f0285dfa9b7f0b7a6c5ec79e28eb662b953 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 12 May 2022 17:37:33 +0100 Subject: [PATCH] libstdc++: Remove whitespace before preprocessor directives These are harmless, but also unnecessary and inconsistent (and their removal was requested by PR libstdc++/17632). libstdc++-v3/ChangeLog: * config/locale/dragonfly/numeric_members.cc: Remove whitespace. * config/locale/gnu/numeric_members.cc: Likewise. * include/bits/locale_facets_nonio.h: Likewise. * libsupc++/typeinfo: Likewise. --- libstdc++-v3/config/locale/dragonfly/numeric_members.cc | 2 +- libstdc++-v3/config/locale/gnu/numeric_members.cc | 2 +- libstdc++-v3/include/bits/locale_facets_nonio.h | 4 ++-- libstdc++-v3/libsupc++/typeinfo | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/config/locale/dragonfly/numeric_members.cc b/libstdc++-v3/config/locale/dragonfly/numeric_members.cc index 51a69dc..b3cf4ad 100644 --- a/libstdc++-v3/config/locale/dragonfly/numeric_members.cc +++ b/libstdc++-v3/config/locale/dragonfly/numeric_members.cc @@ -229,7 +229,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION delete [] _M_data->_M_grouping; delete _M_data; } - #endif +#endif _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/config/locale/gnu/numeric_members.cc b/libstdc++-v3/config/locale/gnu/numeric_members.cc index 591573f..c714d6a 100644 --- a/libstdc++-v3/config/locale/gnu/numeric_members.cc +++ b/libstdc++-v3/config/locale/gnu/numeric_members.cc @@ -267,7 +267,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION delete [] _M_data->_M_grouping; delete _M_data; } - #endif +#endif _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.h b/libstdc++-v3/include/bits/locale_facets_nonio.h index 71a82af..75aef5b 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.h +++ b/libstdc++-v3/include/bits/locale_facets_nonio.h @@ -348,8 +348,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace - // Include host and configuration specific timepunct functions. - #include +// Include host and configuration specific timepunct functions. +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/libsupc++/typeinfo b/libstdc++-v3/libsupc++/typeinfo index 3018a51..376e82b 100644 --- a/libstdc++-v3/libsupc++/typeinfo +++ b/libstdc++-v3/libsupc++/typeinfo @@ -74,11 +74,11 @@ namespace __cxxabiv1 // By default follow the old inline rules to avoid ABI changes. #ifndef __GXX_TYPEINFO_EQUALITY_INLINE - #if !__GXX_WEAK__ - #define __GXX_TYPEINFO_EQUALITY_INLINE 0 - #else - #define __GXX_TYPEINFO_EQUALITY_INLINE 1 - #endif +# if !__GXX_WEAK__ +# define __GXX_TYPEINFO_EQUALITY_INLINE 0 +# else +# define __GXX_TYPEINFO_EQUALITY_INLINE 1 +# endif #endif namespace std -- 2.7.4