[Lldb-commits] [lldb] r128720 - in /lldb/trunk: source/Core/DataExtractor.cpp source/Expression/DWARFExpression.cpp source/Symbol/ClangASTContext.cpp tools/debugserver/source/DNBDataRef.cpp

Greg Clayton gclayton at apple.com
Fri Apr 1 11:14:08 PDT 2011


Author: gclayton
Date: Fri Apr  1 13:14:08 2011
New Revision: 128720

URL: http://llvm.org/viewvc/llvm-project?rev=128720&view=rev
Log:
Get rid of LONG_LONG_MAX and ULONG_LONG_MAX, and use LLONG_MAX and ULLONG_MAX
respectively.


Modified:
    lldb/trunk/source/Core/DataExtractor.cpp
    lldb/trunk/source/Expression/DWARFExpression.cpp
    lldb/trunk/source/Symbol/ClangASTContext.cpp
    lldb/trunk/tools/debugserver/source/DNBDataRef.cpp

Modified: lldb/trunk/source/Core/DataExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/DataExtractor.cpp?rev=128720&r1=128719&r2=128720&view=diff
==============================================================================
--- lldb/trunk/source/Core/DataExtractor.cpp (original)
+++ lldb/trunk/source/Core/DataExtractor.cpp Fri Apr  1 13:14:08 2011
@@ -887,7 +887,7 @@
 DataExtractor::GetGNUEHPointer (uint32_t *offset_ptr, uint32_t eh_ptr_enc, lldb::addr_t pc_rel_addr, lldb::addr_t text_addr, lldb::addr_t data_addr)//, BSDRelocs *data_relocs) const
 {
     if (eh_ptr_enc == DW_EH_PE_omit)
-        return ULONG_LONG_MAX;  // Value isn't in the buffer...
+        return ULLONG_MAX;  // Value isn't in the buffer...
 
     uint64_t baseAddress = 0;
     uint64_t addressValue = 0;

Modified: lldb/trunk/source/Expression/DWARFExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/DWARFExpression.cpp?rev=128720&r1=128719&r2=128720&view=diff
==============================================================================
--- lldb/trunk/source/Expression/DWARFExpression.cpp (original)
+++ lldb/trunk/source/Expression/DWARFExpression.cpp Fri Apr  1 13:14:08 2011
@@ -2175,9 +2175,9 @@
                 stack.pop_back();
                 
                 Scalar &index_scalar = index_val.ResolveValue(exe_ctx, ast_context);
-                int64_t index = index_scalar.SLongLong(LONG_LONG_MAX);
+                int64_t index = index_scalar.SLongLong(LLONG_MAX);
                 
-                if (index == LONG_LONG_MAX)
+                if (index == LLONG_MAX)
                 {
                     if (error_ptr)
                         error_ptr->SetErrorString("Invalid array index.");

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=128720&r1=128719&r2=128720&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Fri Apr  1 13:14:08 2011
@@ -4266,7 +4266,7 @@
         if (member_type)
             *member_type = cast<ConstantArrayType>(qual_type)->getElementType().getAsOpaquePtr();
         if (size)
-            *size = cast<ConstantArrayType>(qual_type)->getSize().getLimitedValue(ULONG_LONG_MAX);
+            *size = cast<ConstantArrayType>(qual_type)->getSize().getLimitedValue(ULLONG_MAX);
         return true;
     case clang::Type::IncompleteArray:
         if (member_type)

Modified: lldb/trunk/tools/debugserver/source/DNBDataRef.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DNBDataRef.cpp?rev=128720&r1=128719&r2=128720&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/DNBDataRef.cpp (original)
+++ lldb/trunk/tools/debugserver/source/DNBDataRef.cpp Fri Apr  1 13:14:08 2011
@@ -207,7 +207,7 @@
 DNBDataRef::GetDwarfEHPtr(offset_t *offset_ptr, uint32_t encoding) const
 {
     if (encoding == DW_EH_PE_omit)
-        return ULONG_LONG_MAX;    // Value isn't in the buffer...
+        return ULLONG_MAX;    // Value isn't in the buffer...
 
     uint64_t baseAddress = 0;
     uint64_t addressValue = 0;





More information about the lldb-commits mailing list