summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2013-11-26 15:18:40 +0000
committerpfg <pfg@FreeBSD.org>2013-11-26 15:18:40 +0000
commit5f3a48e3be0e8a05efcb95a7efebec7bf668856f (patch)
tree76e884df9f43a7fb19be2d0490a14a7ff4395c88
parent537e7ce6f90e4344fd3ec0e87736372b8fc3cef4 (diff)
downloadFreeBSD-src-5f3a48e3be0e8a05efcb95a7efebec7bf668856f.zip
FreeBSD-src-5f3a48e3be0e8a05efcb95a7efebec7bf668856f.tar.gz
Forced commit to note that r258652 is actually:
gcc: Move conditions before an assert. It is a bit cleaner to check the conditions before calling the assertion. It also preserves the style from the rest of the code. This is just a cosmetical change to match better what both Apple's gcc42 and Android's gcc-4.2.1 do.
-rw-r--r--contrib/gcc/cp/decl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gcc/cp/decl.c b/contrib/gcc/cp/decl.c
index 0bf09d4..c35f74a 100644
--- a/contrib/gcc/cp/decl.c
+++ b/contrib/gcc/cp/decl.c
@@ -4966,7 +4966,7 @@ make_rtl_for_nonlocal_decl (tree decl, tree init, const char* asmspec)
{
gcc_assert (TREE_STATIC (decl));
/* An in-class declaration of a static data member should be
- external; it is only a declaration, and not a definition. */
+ external; it is only a declaration, and not a definition. */
if (init == NULL_TREE && DECL_INITIAL (decl) == NULL_TREE)
gcc_assert (DECL_EXTERNAL (decl));
}
OpenPOWER on IntegriCloud