Commit a8ada594 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

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

parents 585efafb ffb2d5de

src/debug.cpp

+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <qdict.h>



#include "debug.h"

#include "message.h"



//------------------------------------------------------------------------
@@ -120,3 +121,14 @@ bool Debug::isFlagSet(DebugMask mask) 
  return (curMask & mask)!=0;

}



void Debug::printFlags(void)

{

  int i;

  for (i = 0; i < sizeof(s_labels)/sizeof(*s_labels); i++)

  {

     if (s_labels[i].name)

     {

        msg("\t%s\n",s_labels[i].name);

     }

  }

}

src/debug.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ class Debug 
    static int  setFlag(const char *label);

    static void clearFlag(const char *label);

    static bool isFlagSet(DebugMask mask);

    static void printFlags(void);

    static void setPriority(int p);

    

  private:

src/doxygen.cpp

+14 −0
Original line number Diff line number Diff line
@@ -9772,6 +9772,18 @@ static void dumpSymbolMap() 
  }

}



// print developer options of doxygen

static void devUsage()

{

  msg("Developer parameters:\n");

  msg("  -m          dump symbol map\n");

  msg("  -b          output to wizard\n");

  msg("  -T          activates output generation via Django like template\n");

  msg("  -d <level>  enable a debug level, such as (multiple invocations of -d are possible):\n");

  Debug::printFlags();

}





//----------------------------------------------------------------------------

// print the usage of doxygen
@@ -9799,6 +9811,7 @@ static void usage(const char *name) 
  msg("    RTF:   %s -e rtf extensionsFile\n\n",name);

  msg("If -s is specified the comments of the configuration items in the config file will be omitted.\n");

  msg("If configName is omitted `Doxyfile' will be used as a default.\n\n");

  msg("-v print version string\n");

}



//----------------------------------------------------------------------------
@@ -10020,6 +10033,7 @@ void readConfiguration(int argc, char **argv) 
        if (!debugLabel)

        {

          err("option \"-d\" is missing debug specifier.\n");

          devUsage();

          cleanUpDoxygen();

          exit(1);

        }

src/namespacedef.cpp

+2 −2
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ void NamespaceSDict::writeDeclaration(OutputList &ol,const char *title, 
      {

        if (nd->isConstantGroup())

        {

          err("Internal inconsistency: constant group but not IDL?");

          err("Internal inconsistency: constant group but not IDL?\n");

        }

        found=TRUE;

        break;
@@ -936,7 +936,7 @@ void NamespaceSDict::writeDeclaration(OutputList &ol,const char *title, 
        }

        else

        {

          err("Internal inconsistency: namespace in IDL not module or cg");

          err("Internal inconsistency: namespace in IDL not module or cg\n");

        }

      }

      ol.insertMemberAlign();