Merge branch 'master' of github.com:doxygen/doxygen

6 files changed, 33 insertions, 34 deletions

diff --git a/src/classdef.cpp b/src/classdef.cpp
index f1d9c60..17b9acb 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -2998,7 +2998,6 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const
             )
             && memberWritten)
         {
-          ol.writeString("<span class=\"mlabel\">");
           StringVector sl;
           if (lang==SrcLangExt_VHDL)
           {
@@ -3040,11 +3039,15 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const
             if (!firstSpan)
             {
               ol.writeString("</span><span class=\"mlabel\">");
+            }
+            else
+            {
+              ol.writeString("<span class=\"mlabel\">");
               firstSpan=false;
             }
             ol.docify(s.c_str());
           }
-          ol.writeString("</span>");
+          if (!firstSpan) ol.writeString("</span>");
         }
         if (memberWritten)
         {
diff --git a/src/configimpl.l b/src/configimpl.l
index 99f15a4..4443f9c 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -1313,7 +1313,6 @@ static QCString configFileToString(const char *name)
     return ret;
   };
 
-  bool fileOpened=FALSE;
   if (name[0]=='-' && name[1]==0) // read from stdin
   {
     // read contents from stdin into contents string
@@ -1324,16 +1323,11 @@ static QCString configFileToString(const char *name)
     std::ifstream f(name,std::istream::in);
     if (!f.is_open())
     {
-      config_err("file '%s' not found\n",name);
+      config_term("file '%s' not found or could not be opened\n",name);
       return "";
     }
     return stream2string(f);
   }
-  if (!fileOpened)
-  {
-    config_term("cannot open file '%s' for reading\n",name);
-  }
-  return "";
 }
 
 bool ConfigImpl::parseString(const char *fn,const char *str,bool update)
diff --git a/src/context.cpp b/src/context.cpp
index 0064051..ec1d7a4 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -255,9 +255,9 @@ class PropertyMapper
     void addProperty(const char *name,typename PropertyFunc::Handler handle)
     {
       auto it = m_map.find(name);
-      if (it==m_map.end())
+      if (it!=m_map.end())
       {
-        err("Error: adding property '%s' more than once",name);
+        err("adding property '%s' more than once\n",name);
       }
       else
       {
@@ -1278,7 +1278,7 @@ static TemplateVariant parseDoc(const Definition *def,const QCString &file,int l
       break;
     // TODO: support other generators
     default:
-      err("context.cpp: output format not yet supported");
+      err("context.cpp: output format not yet supported\n");
       break;
   }
   QCString docs = ts.str().c_str();
@@ -1315,7 +1315,7 @@ static TemplateVariant parseCode(MemberDef *md,const QCString &scopeName,const Q
       break;
     // TODO: support other generators
     default:
-      err("context.cpp: output format not yet supported");
+      err("context.cpp: output format not yet supported\n");
       break;
   }
   QCString s = t.str();
@@ -1370,7 +1370,7 @@ static TemplateVariant parseCode(const FileDef *fd,const QCString &relPath)
       break;
     // TODO: support other generators
     default:
-      err("context.cpp: output format not yet supported");
+      err("context.cpp: output format not yet supported\n");
       break;
   }
   QCString s = t.str();
@@ -1978,7 +1978,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             break;
             // TODO: support other generators
           default:
-            err("context.cpp: output format not yet supported");
+            err("context.cpp: output format not yet supported\n");
             break;
         }
         g_globals.dynSectionId++;
@@ -2024,7 +2024,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             break;
             // TODO: support other generators
           default:
-            err("context.cpp: output format not yet supported");
+            err("context.cpp: output format not yet supported\n");
             break;
         }
         g_globals.dynSectionId++;
@@ -2075,7 +2075,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             break;
             // TODO: support other generators
           default:
-            err("context.cpp: output format not yet supported");
+            err("context.cpp: output format not yet supported\n");
             break;
         }
         g_globals.dynSectionId++;
@@ -3080,7 +3080,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             break;
             // TODO: support other generators
           default:
-            err("context.cpp: output format not yet supported");
+            err("context.cpp: output format not yet supported\n");
             break;
         }
         g_globals.dynSectionId++;
@@ -3132,7 +3132,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             break;
             // TODO: support other generators
           default:
-            err("context.cpp: output format not yet supported");
+            err("context.cpp: output format not yet supported\n");
             break;
         }
         g_globals.dynSectionId++;
@@ -3546,7 +3546,7 @@ class DirContext::Private : public DefinitionContext<DirContext::Private>
             break;
             // TODO: support other generators
           default:
-            err("context.cpp: output format not yet supported");
+            err("context.cpp: output format not yet supported\n");
             break;
         }
         g_globals.dynSectionId++;
@@ -4960,7 +4960,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             break;
             // TODO: support other generators
           default:
-            err("context.cpp: output format not yet supported");
+            err("context.cpp: output format not yet supported\n");
             break;
         }
         g_globals.dynSectionId++;
@@ -4976,7 +4976,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
     {
       if (hasReferencedByRelation().toBool())
       {
-        err("context.cpp: output format not yet supported");
+        err("context.cpp: output format not yet supported\n");
       }
       return TemplateVariant("");
     }
@@ -5032,7 +5032,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             break;
             // TODO: support other generators
           default:
-            err("context.cpp: output format not yet supported");
+            err("context.cpp: output format not yet supported\n");
             break;
         }
         g_globals.dynSectionId++;
@@ -5048,7 +5048,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
     {
       if (hasReferencesRelation().toBool())
       {
-         err("context.cpp: output format not yet supported");
+         err("context.cpp: output format not yet supported\n");
       }
       return TemplateVariant("");
     }
@@ -5305,7 +5305,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
             break;
             // TODO: support other generators
           default:
-            err("context.cpp: output format not yet supported");
+            err("context.cpp: output format not yet supported\n");
             break;
         }
         g_globals.dynSectionId++;
diff --git a/src/defargs.l b/src/defargs.l
index 18e9505..36ed99c 100644
--- a/src/defargs.l
+++ b/src/defargs.l
@@ -771,7 +771,7 @@ static bool nameIsActuallyPartOfType(QCString &name)
 }
 
 /*! Converts an argument string into an ArgumentList.
- *  \param[in] lang langage of the current argument list
+ *  \param[in] lang language of the current argument list
  *  \param[in] argsString the list of Arguments.
  *  \param[out] extraTypeChars point to string to which trailing characters 
  *              for complex types are written to
diff --git a/src/filesystem.hpp b/src/filesystem.hpp
index bdb174a..e45f296 100644
--- a/src/filesystem.hpp
+++ b/src/filesystem.hpp
@@ -54,7 +54,7 @@
 #ifndef GHC_OS_DETECTED
 #if defined(__APPLE__) && defined(__MACH__)
 #define GHC_OS_MACOS
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__CYGWIN__)
 #define GHC_OS_LINUX
 #if defined(__ANDROID__)
 #define GHC_OS_ANDROID
@@ -255,7 +255,7 @@
 #define LWG_2682_BEHAVIOUR
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // LWG #2395 makes crate_directory/create_directories not emit an error if there is a regular
-// file with that name, it is superceded by P1164R1, so only activate if really needed
+// file with that name, it is superseded by P1164R1, so only activate if really needed
 // #define LWG_2935_BEHAVIOUR
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // LWG #2936 enables new element wise (more expensive) path comparison
@@ -275,7 +275,7 @@
 // as UTF-8 encoded. With this define you can enfoce the old behavior on Windows, using
 // std::string as backend and for fs::path::native() and char for fs::path::c_str(). This
 // needs more conversions so it is (an was before v1.5) slower, bot might help keeping source
-// homogenous in a multi platform project.
+// homogeneous in a multi platform project.
 // #define GHC_WIN_DISABLE_WSTRING_STORAGE_TYPE
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // Raise errors/exceptions when invalid unicode codepoints or UTF-8 sequences are found,
@@ -296,7 +296,7 @@
 #define GHC_WITH_EXCEPTIONS
 #endif
 #if !defined(GHC_WITH_EXCEPTIONS) && defined(GHC_RAISE_UNICODE_ERRORS)
-#error "Can't raise unicode errors whith exception support disabled"
+#error "Can't raise unicode errors with exception support disabled"
 #endif
 
 namespace ghc {
@@ -368,7 +368,7 @@ public:
     using path_helper_base<value_type>::preferred_separator;
 
     // 30.10.10.1 enumeration format
-    /// The path format in wich the constructor argument is given.
+    /// The path format in which the constructor argument is given.
     enum format {
         generic_format,  ///< The generic format, internally used by
                          ///< ghc::filesystem::path with slashes
diff --git a/src/message.cpp b/src/message.cpp
index 6c7c8ac..eb20c19 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -122,9 +122,11 @@ static void handle_warn_as_error()
 {
   if (warnBehavior == WARN_YES)
   {
-    std::unique_lock<std::mutex> lock(g_mutex);
-    QCString msgText = " (warning treated as error, aborting now)\n";
-    fwrite(msgText.data(),1,msgText.length(),warnFile);
+    {
+      std::unique_lock<std::mutex> lock(g_mutex);
+      QCString msgText = " (warning treated as error, aborting now)\n";
+      fwrite(msgText.data(),1,msgText.length(),warnFile);
+    }
     exit(1);
   }
   warnStat = true;