[Gnash-commit] [SCM] Gnash branch, master, updated. eac51d44944cd26562221663c6414d7b34e23df6

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  eac51d44944cd26562221663c6414d7b34e23df6 (commit)
       via  9049f585363a7f00103ae20a0d43886b0d9396f9 (commit)
      from  1b68dac7fb05d3b529fa127ad4eb738dd9f0a36b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=eac51d44944cd26562221663c6414d7b34e23df6


commit eac51d44944cd26562221663c6414d7b34e23df6
Merge: 9049f58 1b68dac
Author: Benjamin Wolsey <address@hidden>
Date:   Mon Nov 22 17:44:17 2010 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=9049f585363a7f00103ae20a0d43886b0d9396f9


commit 9049f585363a7f00103ae20a0d43886b0d9396f9
Author: Benjamin Wolsey <address@hidden>
Date:   Mon Nov 22 17:10:35 2010 +0100

    Spacing.

diff --git a/libcore/asobj/String_as.cpp b/libcore/asobj/String_as.cpp
index e5f192c..5b31785 100644
--- a/libcore/asobj/String_as.cpp
+++ b/libcore/asobj/String_as.cpp
@@ -636,12 +636,10 @@ string_toUpperCase(const fn_call& fn)
     // Most other locales are correct. FIXME: get this to
     // work regardless of user's current settings.
     std::locale currentLocale;
-    try
-    {
+    try {
         currentLocale = std::locale("");
     }
-    catch (std::runtime_error& e)
-    {
+    catch (const std::runtime_error& e) {
         currentLocale = std::locale::classic();
     }
 
@@ -656,13 +654,12 @@ string_toUpperCase(const fn_call& fn)
     try {
         boost::to_upper(wstr, currentLocale);
     }
-    catch (std::bad_cast&)
-        {
-            // std::use_facet<wchar_t>(currentLocale) called from
-            // boost::to_upper may throw std::bad_cast
-            log_error(_("bad_cast caught"));
-            std::abort();
-        }
+    catch (const std::bad_cast&) {
+        // std::use_facet<wchar_t>(currentLocale) called from
+        // boost::to_upper may throw std::bad_cast
+        log_error(_("bad_cast caught"));
+        std::abort();
+    }
 #else
     size_t l = wstr.size();
     for (size_t i = 0; i < l; ++i) {

-----------------------------------------------------------------------

Summary of changes:
 libcore/asobj/String_as.cpp |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Gnash