commit 671dd558650c457d54f124a58db91b0e26802399
author Enrico Granata <egranata@apple.com> Wed Oct 24 21:42:49 2012 +0000
committer Enrico Granata <egranata@apple.com> Wed Oct 24 21:42:49 2012 +0000
tree 66bdd73024d68693ebe52b744b6d1509aa706472
parent 4a0a1252629a807d37ac252b0239f10204eddedc

Reverting the changes to Scalar since this class needs to follow C rules for type promotion

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@166626 91177308-0d34-0410-b5e6-96231b3b80d8

source/Core/Scalar.cpp

diff --git a/source/Core/Scalar.cpp b/source/Core/Scalar.cpp
index 58f72ed..eaf0bc5 100644
--- a/source/Core/Scalar.cpp
+++ b/source/Core/Scalar.cpp
@@ -765,11 +765,11 @@
     {
     default:
     case e_void:        break;
-    case e_sint:         
+    case e_sint:        return (unsigned int)m_data.sint;
     case e_uint:        return (unsigned int)m_data.uint;
-    case e_slong:        
+    case e_slong:       return (unsigned int)m_data.slong;
     case e_ulong:       return (unsigned int)m_data.ulong;
-    case e_slonglong:    
+    case e_slonglong:   return (unsigned int)m_data.slonglong;
     case e_ulonglong:   return (unsigned int)m_data.ulonglong;
     case e_float:       return (unsigned int)m_data.flt;
     case e_double:      return (unsigned int)m_data.dbl;
@@ -808,11 +808,11 @@
     {
     default:
     case e_void:        break;
-    case e_sint:         
+    case e_sint:        return (unsigned long)m_data.sint;
     case e_uint:        return (unsigned long)m_data.uint;
-    case e_slong:        
+    case e_slong:       return (unsigned long)m_data.slong;
     case e_ulong:       return (unsigned long)m_data.ulong;
-    case e_slonglong:    
+    case e_slonglong:   return (unsigned long)m_data.slonglong;
     case e_ulonglong:   return (unsigned long)m_data.ulonglong;
     case e_float:       return (unsigned long)m_data.flt;
     case e_double:      return (unsigned long)m_data.dbl;
@@ -902,11 +902,11 @@
     {
     default:
     case e_void:        break;
-    case e_sint:        
+    case e_sint:        return (unsigned long long)m_data.sint;
     case e_uint:        return (unsigned long long)m_data.uint;
-    case e_slong:       
+    case e_slong:       return (unsigned long long)m_data.slong;
     case e_ulong:       return (unsigned long long)m_data.ulong;
-    case e_slonglong:   
+    case e_slonglong:   return (unsigned long long)m_data.slonglong;
     case e_ulonglong:   return (unsigned long long)m_data.ulonglong;
     case e_float:       return (unsigned long long)m_data.flt;
     case e_double:      return (unsigned long long)m_data.dbl;