[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-common.cc |    2 +-
 src/hb-icu.cc    |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 365c03fc2bcdb4098314a0e123c46018fb882586
Merge: c36c4a9 d1897a9
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jan 3 21:55:30 2015 -0800

    Merge pull request #75 from cpeterso/cpeterso/Wunused-value
    
    Fix hb_atomic_ptr_cmpexch -Wunused-value warnings

commit d1897a98d8da40cffb57c07099a9a93cfeaacc36
Author: Chris Peterson <cpeterson at mozilla.com>
Date:   Sat Jan 3 19:46:19 2015 -0800

    Fix hb_atomic_ptr_cmpexch -Wunused-value warnings

diff --git a/src/hb-common.cc b/src/hb-common.cc
index a6a5144..d308f36 100644
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -345,7 +345,7 @@ hb_language_get_default (void)
   hb_language_t language = (hb_language_t) hb_atomic_ptr_get (&default_language);
   if (unlikely (language == HB_LANGUAGE_INVALID)) {
     language = hb_language_from_string (setlocale (LC_CTYPE, NULL), -1);
-    hb_atomic_ptr_cmpexch (&default_language, HB_LANGUAGE_INVALID, language);
+    (void) hb_atomic_ptr_cmpexch (&default_language, HB_LANGUAGE_INVALID, language);
   }
 
   return default_language;
diff --git a/src/hb-icu.cc b/src/hb-icu.cc
index 86c8b5c..24cec9d 100644
--- a/src/hb-icu.cc
+++ b/src/hb-icu.cc
@@ -363,10 +363,8 @@ hb_icu_get_unicode_funcs (void)
   if (!hb_atomic_ptr_get (&normalizer)) {
     UErrorCode icu_err = U_ZERO_ERROR;
     /* We ignore failure in getNFCInstace(). */
-    hb_atomic_ptr_cmpexch (&normalizer, NULL, unorm2_getNFCInstance (&icu_err));
+    (void) hb_atomic_ptr_cmpexch (&normalizer, NULL, unorm2_getNFCInstance (&icu_err));
   }
 #endif
   return const_cast<hb_unicode_funcs_t *> (&_hb_icu_unicode_funcs);
 }
-
-