From b0239ba7beace280d17d4a20c422f4400a8dd4d6 Mon Sep 17 00:00:00 2001
From: Andrey Semashev <andrey.semashev@gmail.com>
Date: Wed, 11 Jan 2017 22:25:31 +0300
Subject: [PATCH] Simplified demangle() a little to make better use of RVO.

---
 include/boost/core/demangle.hpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/include/boost/core/demangle.hpp b/include/boost/core/demangle.hpp
index f13c26a..dc714d8 100644
--- a/include/boost/core/demangle.hpp
+++ b/include/boost/core/demangle.hpp
@@ -93,15 +93,10 @@ inline void demangle_free( char const * name ) BOOST_NOEXCEPT
 inline std::string demangle( char const * name )
 {
     scoped_demangled_name demangled_name( name );
-    char const * const p = demangled_name.get();
-    if( p )
-    {
-        return p;
-    }
-    else
-    {
-        return name;
-    }
+    char const * p = demangled_name.get();
+    if( !p )
+        p = name;
+    return p;
 }
 
 #else