Made all other "operator bool"s explicit and ensured

scallanan · scallanan · commit 9076c0fffbc1 · 2013-10-04T21:35:29.000Z
that all clients use them explicitly.  This will hopefully
prevent any future confusion where things get cast to types
we don't expect.

&lt;rdar://problem/15146458&gt;

llvm-svn: 191984
diff --git a/lldb/include/lldb/Core/ModuleSpec.h b/lldb/include/lldb/Core/ModuleSpec.h
@@ -288,7 +288,7 @@ class ModuleSpec
     }
 
     
-    operator bool () const
+    explicit operator bool () const
     {
         if (m_file)
             return true;
diff --git a/lldb/include/lldb/Host/FileSpec.h b/lldb/include/lldb/Host/FileSpec.h
@@ -177,7 +177,7 @@ class FileSpec
     ///     A pointer to this object if either the directory or filename
     ///     is valid, NULL otherwise.
     //------------------------------------------------------------------
-    operator bool() const;
+    explicit operator bool() const;
 
     //------------------------------------------------------------------
     /// Logical NOT operator.
diff --git a/lldb/include/lldb/Interpreter/CommandObject.h b/lldb/include/lldb/Interpreter/CommandObject.h
@@ -42,7 +42,7 @@ class CommandObject
             return (*help_callback)();
         }
         
-        operator bool() const
+        explicit operator bool() const
         {
             return (help_callback != NULL);
         }
diff --git a/lldb/include/lldb/Interpreter/OptionValueBoolean.h b/lldb/include/lldb/Interpreter/OptionValueBoolean.h
@@ -92,7 +92,7 @@ class OptionValueBoolean : public OptionValue
     ///     /b True this object contains a valid namespace decl, \b 
     ///     false otherwise.
     //------------------------------------------------------------------
-    operator bool() const
+    explicit operator bool() const
     {
         return m_current_value;
     }
diff --git a/lldb/include/lldb/Interpreter/PythonDataObjects.h b/lldb/include/lldb/Interpreter/PythonDataObjects.h
@@ -105,7 +105,7 @@ namespace lldb_private {
         PythonString
         Str ();
         
-        operator bool () const
+        explicit operator bool () const
         {
             return m_py_obj != NULL;
         }
diff --git a/lldb/include/lldb/Interpreter/ScriptInterpreter.h b/lldb/include/lldb/Interpreter/ScriptInterpreter.h
@@ -41,7 +41,7 @@ class ScriptInterpreterObject
         return m_object;
     }
     
-    operator bool ()
+    explicit operator bool ()
     {
         return m_object != NULL;
     }
diff --git a/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h b/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
@@ -282,7 +282,7 @@ class ScriptInterpreterPython : public ScriptInterpreter
             Py_XINCREF(m_object);
         }
         
-        operator bool ()
+        explicit operator bool ()
         {
             return m_object && m_object != Py_None;
         }
@@ -351,7 +351,7 @@ class ScriptInterpreterPython : public ScriptInterpreter
     public:
         PythonInputReaderManager (ScriptInterpreterPython *interpreter);
         
-        operator bool()
+        explicit operator bool()
         {
             return m_error;
         }
diff --git a/lldb/include/lldb/Symbol/ClangASTType.h b/lldb/include/lldb/Symbol/ClangASTType.h
@@ -98,7 +98,7 @@ class ClangASTType
     // Tests
     //----------------------------------------------------------------------
 
-    operator bool () const
+    explicit operator bool () const
     {
         return m_type != NULL && m_ast != NULL;
     }
diff --git a/lldb/include/lldb/Symbol/ClangNamespaceDecl.h b/lldb/include/lldb/Symbol/ClangNamespaceDecl.h
@@ -62,7 +62,7 @@ class ClangNamespaceDecl
     ///     /b True this object contains a valid namespace decl, \b 
     ///     false otherwise.
     //------------------------------------------------------------------
-    operator bool() const
+    explicit operator bool() const
     {
         return m_ast != NULL && m_namespace_decl != NULL;
     }
diff --git a/lldb/include/lldb/Utility/SharingPtr.h b/lldb/include/lldb/Utility/SharingPtr.h
@@ -714,7 +714,7 @@ class IntrusiveSharingPtr
         return ptr_; 
     }
     
-    operator bool() const
+    explicit operator bool() const
     {
         return ptr_ != 0;
     }
diff --git a/lldb/source/API/SBFileSpec.cpp b/lldb/source/API/SBFileSpec.cpp
@@ -61,7 +61,7 @@ SBFileSpec::operator = (const SBFileSpec &rhs)
 bool
 SBFileSpec::IsValid() const
 {
-    return *m_opaque_ap;
+    return m_opaque_ap->operator bool();
 }
 
 bool
diff --git a/lldb/source/API/SBModuleSpec.cpp b/lldb/source/API/SBModuleSpec.cpp
@@ -44,7 +44,7 @@ SBModuleSpec::~SBModuleSpec ()
 bool
 SBModuleSpec::IsValid () const
 {
-    return *m_opaque_ap;
+    return m_opaque_ap->operator bool();
 }
 
 void
diff --git a/lldb/source/Commands/CommandObjectRegister.cpp b/lldb/source/Commands/CommandObjectRegister.cpp
@@ -98,7 +98,7 @@ class CommandObjectRegisterRead : public CommandObjectParsed
             {
                 strm.Indent ();
 
-                bool prefix_with_altname = m_command_options.alternate_name;
+                bool prefix_with_altname = (bool)m_command_options.alternate_name;
                 bool prefix_with_name = !prefix_with_altname;
                 reg_value.Dump(&strm, reg_info, prefix_with_name, prefix_with_altname, m_format_options.GetFormat(), 8);
                 if ((reg_info->encoding == eEncodingUint) || (reg_info->encoding == eEncodingSint))
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
@@ -1900,12 +1900,12 @@ FormatPromptRecurse
                                                 if (var_name_begin[0] == 'n' || var_name_begin[5] == 'f')
                                                 {
                                                     format_file_spec.GetFilename() = exe_module->GetFileSpec().GetFilename();
-                                                    var_success = format_file_spec;
+                                                    var_success = (bool)format_file_spec;
                                                 }
                                                 else
                                                 {
                                                     format_file_spec = exe_module->GetFileSpec();
-                                                    var_success = format_file_spec;
+                                                    var_success = (bool)format_file_spec;
                                                 }
                                             }
                                         }
@@ -2065,12 +2065,12 @@ FormatPromptRecurse
                                             if (IsToken (var_name_begin, "basename}"))
                                             {
                                                 format_file_spec.GetFilename() = module->GetFileSpec().GetFilename();
-                                                var_success = format_file_spec;
+                                                var_success = (bool)format_file_spec;
                                             }
                                             else if (IsToken (var_name_begin, "fullpath}"))
                                             {
                                                 format_file_spec = module->GetFileSpec();
-                                                var_success = format_file_spec;
+                                                var_success = (bool)format_file_spec;
                                             }
                                         }
                                     }
@@ -2089,12 +2089,12 @@ FormatPromptRecurse
                                     if (IsToken (var_name_begin, "basename}"))
                                     {
                                         format_file_spec.GetFilename() = sc->comp_unit->GetFilename();
-                                        var_success = format_file_spec;
+                                        var_success = (bool)format_file_spec;
                                     }
                                     else if (IsToken (var_name_begin, "fullpath}"))
                                     {
                                         format_file_spec = *sc->comp_unit;
-                                        var_success = format_file_spec;
+                                        var_success = (bool)format_file_spec;
                                     }
                                 }
                             }
@@ -2353,12 +2353,12 @@ FormatPromptRecurse
                                         if (IsToken (var_name_begin, "basename}"))
                                         {
                                             format_file_spec.GetFilename() = sc->line_entry.file.GetFilename();
-                                            var_success = format_file_spec;
+                                            var_success = (bool)format_file_spec;
                                         }
                                         else if (IsToken (var_name_begin, "fullpath}"))
                                         {
                                             format_file_spec = sc->line_entry.file;
-                                            var_success = format_file_spec;
+                                            var_success = (bool)format_file_spec;
                                         }
                                     }
                                     else if (IsTokenWithFormat (var_name_begin, "number", token_format, "%" PRIu64, exe_ctx, sc))
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.h
@@ -54,7 +54,7 @@ class DWARFDeclContext
         }
 
         // Test operator
-        operator bool() const
+        explicit operator bool() const
         {
             return tag != 0;
         }
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -2625,7 +2625,7 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (ClangASTType &clang_type)
             }
         }
 
-        return clang_type;
+        return (bool)clang_type;
 
     case DW_TAG_enumeration_type:
         clang_type.StartTagDeclarationDefinition ();
@@ -2637,7 +2637,7 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (ClangASTType &clang_type)
             ParseChildEnumerators(sc, clang_type, is_signed, type->GetByteSize(), dwarf_cu, die);
         }
         clang_type.CompleteTagDeclarationDefinition ();
-        return clang_type;
+        return (bool)clang_type;
 
     default:
         assert(false && "not a forward clang type decl!");

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ class ModuleSpec`
`288`	`288`	`}`
`289`	`289`
`290`	`290`
`291`		`- operator bool () const`
	`291`	`+ explicit operator bool () const`
`292`	`292`	`{`
`293`	`293`	`if (m_file)`
`294`	`294`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class CommandObject`
`42`	`42`	`return (*help_callback)();`
`43`	`43`	`}`
`44`	`44`
`45`		`- operator bool() const`
	`45`	`+ explicit operator bool() const`
`46`	`46`	`{`
`47`	`47`	`return (help_callback != NULL);`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ class OptionValueBoolean : public OptionValue`
`92`	`92`	`/// /b True this object contains a valid namespace decl, \b`
`93`	`93`	`/// false otherwise.`
`94`	`94`	`//------------------------------------------------------------------`
`95`		`- operator bool() const`
	`95`	`+ explicit operator bool() const`
`96`	`96`	`{`
`97`	`97`	`return m_current_value;`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ namespace lldb_private {`
`105`	`105`	`PythonString`
`106`	`106`	`Str ();`
`107`	`107`
`108`		`- operator bool () const`
	`108`	`+ explicit operator bool () const`
`109`	`109`	`{`
`110`	`110`	`return m_py_obj != NULL;`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class ScriptInterpreterObject`
`41`	`41`	`return m_object;`
`42`	`42`	`}`
`43`	`43`
`44`		`- operator bool ()`
	`44`	`+ explicit operator bool ()`
`45`	`45`	`{`
`46`	`46`	`return m_object != NULL;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ class ScriptInterpreterPython : public ScriptInterpreter`
`282`	`282`	`Py_XINCREF(m_object);`
`283`	`283`	`}`
`284`	`284`
`285`		`- operator bool ()`
	`285`	`+ explicit operator bool ()`
`286`	`286`	`{`
`287`	`287`	`return m_object && m_object != Py_None;`
`288`	`288`	`}`
`@@ -351,7 +351,7 @@ class ScriptInterpreterPython : public ScriptInterpreter`
`351`	`351`	`public:`
`352`	`352`	`PythonInputReaderManager (ScriptInterpreterPython *interpreter);`
`353`	`353`
`354`		`- operator bool()`
	`354`	`+ explicit operator bool()`
`355`	`355`	`{`
`356`	`356`	`return m_error;`
`357`	`357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ class ClangASTType`
`98`	`98`	`// Tests`
`99`	`99`	`//----------------------------------------------------------------------`
`100`	`100`
`101`		`- operator bool () const`
	`101`	`+ explicit operator bool () const`
`102`	`102`	`{`
`103`	`103`	`return m_type != NULL && m_ast != NULL;`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class ClangNamespaceDecl`
`62`	`62`	`/// /b True this object contains a valid namespace decl, \b`
`63`	`63`	`/// false otherwise.`
`64`	`64`	`//------------------------------------------------------------------`
`65`		`- operator bool() const`
	`65`	`+ explicit operator bool() const`
`66`	`66`	`{`
`67`	`67`	`return m_ast != NULL && m_namespace_decl != NULL;`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ class IntrusiveSharingPtr`
`714`	`714`	`return ptr_;`
`715`	`715`	`}`
`716`	`716`
`717`		`- operator bool() const`
	`717`	`+ explicit operator bool() const`
`718`	`718`	`{`
`719`	`719`	`return ptr_ != 0;`
`720`	`720`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ SBFileSpec::operator = (const SBFileSpec &rhs)`
`61`	`61`	`bool`
`62`	`62`	`SBFileSpec::IsValid() const`
`63`	`63`	`{`
`64`		`- return *m_opaque_ap;`
	`64`	`+ return m_opaque_ap->operator bool();`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`bool`