Fix Android build after r266267

[ovyalov]

Summary

Fix Android build after r266267

[ovyalov]

Submitted as http://reviews.llvm.org/rL266274

[jingham]

Why is this necessary? stdout is a local variable defined in this scope. Why would the android g++ have problems with this?

Anyway, if you have to avoid using stdout as a name, maybe name it std_out as that better reflects its meaning.

[ovyalov]

In D19092#401450, @jingham wrote:

Why is this necessary? stdout is a local variable defined in this scope. Why would the android g++ have problems with this?

Anyway, if you have to avoid using stdout as a name, maybe name it std_out as that better reflects its meaning.

My understanding that NDK toolchain exposes stdout global variable that is caused name collision here.

[labath]

Judging by the cryptic error message, and the fact that a global variable should not cause an issue, i suspect stdout was a macro in this case...

[granata.enrico]

I am not an Apple employee working on LLDB anymore

source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp

DoExecute(Args& command, CommandReturnObject &result) override
         }
         
         Process *process = m_exe_ctx.GetProcessPtr();
         ObjCLanguageRuntime *objc_runtime = process->GetObjCLanguageRuntime();
         if (objc_runtime)
         {
             auto iterators_pair = objc_runtime->GetDescriptorIteratorPair();
             auto iterator = iterators_pair.first;
-            Stream &stdout(result.GetOutputStream());
+            auto &out = result.GetOutputStream();
             for(; iterator != iterators_pair.second; iterator++)
             {
                 if (iterator->second)
                 {
                     const char* class_name = iterator->second->GetClassName().AsCString("<unknown>");
                     if (regex_up && class_name && !regex_up->Execute(class_name))
                         continue;
-                    stdout.Printf("isa = 0x%" PRIx64, iterator->first);
-                    stdout.Printf(" name = %s", class_name);
-                    stdout.Printf(" instance size = %" PRIu64, iterator->second->GetInstanceSize());
-                    stdout.Printf(" num ivars = %" PRIuPTR, (uintptr_t)iterator->second->GetNumIVars());
+                    out.Printf("isa = 0x%" PRIx64, iterator->first);
+                    out.Printf(" name = %s", class_name);
+                    out.Printf(" instance size = %" PRIu64, iterator->second->GetInstanceSize());
+                    out.Printf(" num ivars = %" PRIuPTR, (uintptr_t)iterator->second->GetNumIVars());
                     if (auto superclass = iterator->second->GetSuperclass())
                     {
-                        stdout.Printf(" superclass = %s", superclass->GetClassName().AsCString("<unknown>"));
+                        out.Printf(" superclass = %s", superclass->GetClassName().AsCString("<unknown>"));
                     }
-                    stdout.Printf("\n");
+                    out.Printf("\n");
                     if (m_options.m_verbose)
                     {
                         for(size_t i = 0;
                             i < iterator->second->GetNumIVars();
                             i++)
                         {
                             auto ivar = iterator->second->GetIVarAtIndex(i);
-                            stdout.Printf("  ivar name = %s type = %s size = %" PRIu64 " offset = %" PRId32 "\n",
+                            out.Printf("  ivar name = %s type = %s size = %" PRIu64 " offset = %" PRId32 "\n",
                                                             ivar.m_name.AsCString("<unknown>"),
                                                             ivar.m_type.GetDisplayTypeName().AsCString("<unknown>"),
                                                             ivar.m_size,
                                                             ivar.m_offset);
                         }
                         iterator->second->Describe(nullptr,
-                                                   [objc_runtime, &stdout] (const char* name, const char* type) -> bool {
-                                                       stdout.Printf("  instance method name = %s type = %s\n",
-                                                                     name,
-                                                                     type);
+                                                   [objc_runtime, &out] (const char* name, const char* type) -> bool {
+                                                       out.Printf("  instance method name = %s type = %s\n",
                                                        return false;
                                                    },
-                                                   [objc_runtime, &stdout] (const char* name, const char* type) -> bool {
-                                                       stdout.Printf("  class method name = %s type = %s\n",
-                                                                     name,
-                                                                     type);
+                                                   [objc_runtime, &out] (const char* name, const char* type) -> bool {
+                                                       out.Printf("  class method name = %s type = %s\n",
                                                        return false;
                                                    },
                                                    nullptr);
                     }
                 }
                 else
                 {
                     if (regex_up && !regex_up->Execute(""))
                         continue;
-                    stdout.Printf("isa = 0x%" PRIx64 " has no associated class.\n", iterator->first);
+                    out.Printf("isa = 0x%" PRIx64 " has no associated class.\n", iterator->first);
                 }
             }
             result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
             return true;
         }
         else
         {
             result.AppendError("current process has no Objective-C runtime loaded");