[Lldb-commits] [lldb] r134347 - in /lldb/trunk: include/lldb/Symbol/ClangASTType.h source/Core/Debugger.cpp

[Peter Collingbourne]

Author: pcc
Date: Sat Jul  2 15:42:56 2011
New Revision: 134347

URL: http://llvm.org/viewvc/llvm-project?rev=134347&view=rev
Log:
Fix Linux build errors

Modified:
    lldb/trunk/include/lldb/Symbol/ClangASTType.h
    lldb/trunk/source/Core/Debugger.cpp

Modified: lldb/trunk/include/lldb/Symbol/ClangASTType.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTType.h?rev=134347&r1=134346&r2=134347&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTType.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTType.h Sat Jul  2 15:42:56 2011
@@ -10,6 +10,7 @@
 #ifndef liblldb_ClangASTType_h_
 #define liblldb_ClangASTType_h_
 
+#include <string>
 #include "lldb/lldb-private.h"
 #include "lldb/Core/ClangForward.h"
 

Modified: lldb/trunk/source/Core/Debugger.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Debugger.cpp?rev=134347&r1=134346&r2=134347&view=diff
==============================================================================
--- lldb/trunk/source/Core/Debugger.cpp (original)
+++ lldb/trunk/source/Core/Debugger.cpp Sat Jul  2 15:42:56 2011
@@ -803,7 +803,7 @@
                                    )
                                 {
                                     const char* var_name_final;
-                                    char* close_bracket_position = NULL;
+                                    const char* close_bracket_position = NULL;
                                     const char* percent_position = NULL;
                                     const char* targetvalue;
                                     lldb::Format custom_format = eFormatInvalid;
@@ -842,7 +842,7 @@
                                         {
                                             // TODO: pick a way to say "all entries". this will make more sense once
                                             // regex typenames are in place. now, you need to be size-aware anyways
-                                            char* separator_position = ::strchr(open_bracket_position,'-'); // might be NULL if this is a simple var[N] bitfield
+                                            const char* separator_position = ::strchr(open_bracket_position,'-'); // might be NULL if this is a simple var[N] bitfield
                                             close_bracket_position = ::strchr(open_bracket_position,']');
                                             // as usual, we assume that [] will come before %
                                             //printf("trying to expand a []\n");
@@ -1121,8 +1121,8 @@
                                     const char* open_bracket_position = ::strchr(var_name_begin,'[');
                                     if(open_bracket_position && open_bracket_position < var_name_final)
                                     {
-                                        char* separator_position = ::strchr(open_bracket_position,'-'); // might be NULL if this is a simple var[N] bitfield
-                                        char* close_bracket_position = ::strchr(open_bracket_position,']');
+                                        const char* separator_position = ::strchr(open_bracket_position,'-'); // might be NULL if this is a simple var[N] bitfield
+                                        const char* close_bracket_position = ::strchr(open_bracket_position,']');
                                         // as usual, we assume that [] will come before %
                                         //printf("trying to expand a []\n");
                                         var_name_final = open_bracket_position;
@@ -1191,8 +1191,8 @@
                                     const char* open_bracket_position = ::strchr(var_name_begin,'[');
                                     if(open_bracket_position && open_bracket_position < var_name_final)
                                     {
-                                        char* separator_position = ::strchr(open_bracket_position,'-'); // might be NULL if this is a simple var[N] bitfield
-                                        char* close_bracket_position = ::strchr(open_bracket_position,']');
+                                        const char* separator_position = ::strchr(open_bracket_position,'-'); // might be NULL if this is a simple var[N] bitfield
+                                        const char* close_bracket_position = ::strchr(open_bracket_position,']');
                                         // as usual, we assume that [] will come before %
                                         //printf("trying to expand a []\n");
                                         var_name_final = open_bracket_position;