Minor fixes to local toc logic after feedback

doxygen · Jul 23, 2018 · b6c724e · b6c724e
1 parent 30f7d06
commit b6c724e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/marshal.cpp b/src/marshal.cpp
@@ -740,15 +740,15 @@ LocalToc unmarshalLocalToc(StorageIntf *s)
   int htmlLevel  = unmarshalInt(s);
   int latexLevel = unmarshalInt(s);
   int xmlLevel   = unmarshalInt(s);
-  if ((mask & LocalToc::Html)!=0)
+  if ((mask & (1<<LocalToc::Html))!=0)
   {
     result.enableHtml(htmlLevel);
   }
-  if ((mask & LocalToc::Latex)!=0)
+  if ((mask & (1<<LocalToc::Latex))!=0)
   {
     result.enableLatex(latexLevel);
   }
-  if ((mask & LocalToc::Xml)!=0)
+  if ((mask & (1<<LocalToc::Xml))!=0)
   {
     result.enableXml(xmlLevel);
   }

diff --git a/src/types.h b/src/types.h
@@ -224,7 +224,7 @@ class LocalToc
   public:
     enum Type {
       None                   = 0, // initial value
-      Html                   = 0, // index / also to be used as (1 << Definition::Html)
+      Html                   = 0, // index / also to be used as bit position in mask (1 << Html)
       Latex                  = 1, // ...
       Xml                    = 2, // ...
       numTocTypes            = 3  // number of enum values
@@ -249,9 +249,9 @@ class LocalToc
     }
 
     // getters
-    bool isHtmlEnabled()  const { return (m_mask & Html)!=0;  }
-    bool isLatexEnabled() const { return (m_mask & Latex)!=0; }
-    bool isXmlEnabled()   const { return (m_mask & Xml)!=0;   }
+    bool isHtmlEnabled()  const { return (m_mask & (1<<Html))!=0;  }
+    bool isLatexEnabled() const { return (m_mask & (1<<Latex))!=0; }
+    bool isXmlEnabled()   const { return (m_mask & (1<<Xml))!=0;   }
     bool nothingEnabled() const { return m_mask == None; }
     int htmlLevel()       const { return m_level[Html]; }
     int latexLevel()      const { return m_level[Latex]; }