Don't use double underscores in header guards

Thanks to Markus Elfring (a.k.a. elfring).

Fixes #11 on GitHub.

src/ColorCane.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__COLORCANE_HPP__
-#define ZOGRASCOPE__COLORCANE_HPP__
+#ifndef ZOGRASCOPE_COLORCANE_HPP_
+#define ZOGRASCOPE_COLORCANE_HPP_
 
 #include <boost/utility/string_ref.hpp>
 
@@ -73,4 +73,4 @@ class ColorCane
     Pieces pieces; // List of pieces.
 };
 
-#endif // ZOGRASCOPE__COLORCANE_HPP__
+#endif // ZOGRASCOPE_COLORCANE_HPP_

src/ColorScheme.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__COLORSCHEME_HPP__
-#define ZOGRASCOPE__COLORSCHEME_HPP__
+#ifndef ZOGRASCOPE_COLORSCHEME_HPP_
+#define ZOGRASCOPE_COLORSCHEME_HPP_
 
 #include <array>
 
@@ -35,4 +35,4 @@ class ColorScheme
                static_cast<std::size_t>(ColorGroup::ColorGroupCount)> groups;
 };
 
-#endif // ZOGRASCOPE__COLORSCHEME_HPP__
+#endif // ZOGRASCOPE_COLORSCHEME_HPP_

src/Highlighter.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__HIGHLIGHTER_HPP__
-#define ZOGRASCOPE__HIGHLIGHTER_HPP__
+#ifndef ZOGRASCOPE_HIGHLIGHTER_HPP_
+#define ZOGRASCOPE_HIGHLIGHTER_HPP_
 
 #include <cstdint>
 
@@ -131,4 +131,4 @@ class Highlighter
                                               // diffables with original color.
 };
 
-#endif // ZOGRASCOPE__HIGHLIGHTER_HPP__
+#endif // ZOGRASCOPE_HIGHLIGHTER_HPP_

src/Language.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__LANGUAGE_HPP__
-#define ZOGRASCOPE__LANGUAGE_HPP__
+#ifndef ZOGRASCOPE_LANGUAGE_HPP_
+#define ZOGRASCOPE_LANGUAGE_HPP_
 
 #include <cstdint>
 
@@ -115,4 +115,4 @@ class Language
     bool hasMoveableItems(const Node *x) const;
 };
 
-#endif // ZOGRASCOPE__LANGUAGE_HPP__
+#endif // ZOGRASCOPE_LANGUAGE_HPP_

src/LeafRange.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__LEAFRANGE_HPP__
-#define ZOGRASCOPE__LEAFRANGE_HPP__
+#ifndef ZOGRASCOPE_LEAFRANGE_HPP_
+#define ZOGRASCOPE_LEAFRANGE_HPP_
 
 #include <algorithm>
 #include <iterator>
@@ -118,4 +118,4 @@ class LeafRange : private guts::LeafRangeData, public guts::LeafRangeBase
     { }
 };
 
-#endif // ZOGRASCOPE__LEAFRANGE_HPP__
+#endif // ZOGRASCOPE_LEAFRANGE_HPP_

src/LexerData.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__LEXERDATA_HPP__
-#define ZOGRASCOPE__LEXERDATA_HPP__
+#ifndef ZOGRASCOPE_LEXERDATA_HPP_
+#define ZOGRASCOPE_LEXERDATA_HPP_
 
 #include <cstddef>
 
@@ -46,4 +46,4 @@ struct LexerData
     const char *finish;
 };
 
-#endif // ZOGRASCOPE__LEXERDATA_HPP__
+#endif // ZOGRASCOPE_LEXERDATA_HPP_

src/NodeRange.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__NODERANGE_HPP__
-#define ZOGRASCOPE__NODERANGE_HPP__
+#ifndef ZOGRASCOPE_NODERANGE_HPP_
+#define ZOGRASCOPE_NODERANGE_HPP_
 
 #include <algorithm>
 #include <iterator>
@@ -116,4 +116,4 @@ class NodeRange : private guts::NodeRangeData, public guts::NodeRangeBase
     { }
 };
 
-#endif // ZOGRASCOPE__NODERANGE_HPP__
+#endif // ZOGRASCOPE_NODERANGE_HPP_

src/Printer.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__PRINTER_HPP__
-#define ZOGRASCOPE__PRINTER_HPP__
+#ifndef ZOGRASCOPE_PRINTER_HPP_
+#define ZOGRASCOPE_PRINTER_HPP_
 
 #include <iosfwd>
 #include <string>
@@ -61,4 +61,4 @@ class Printer
     std::vector<Header> headers;                      // Table headers.
 };
 
-#endif // ZOGRASCOPE__PRINTER_HPP__
+#endif // ZOGRASCOPE_PRINTER_HPP_

src/STree.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__STREE_HPP__
-#define ZOGRASCOPE__STREE_HPP__
+#ifndef ZOGRASCOPE_STREE_HPP_
+#define ZOGRASCOPE_STREE_HPP_
 
 #include <string>
 
@@ -66,4 +66,4 @@ class STree
     SNode *root;
 };
 
-#endif // ZOGRASCOPE__STREE_HPP__
+#endif // ZOGRASCOPE_STREE_HPP_

src/TermHighlighter.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__TERMHIGHLIGHTER_HPP__
-#define ZOGRASCOPE__TERMHIGHLIGHTER_HPP__
+#ifndef ZOGRASCOPE_TERMHIGHLIGHTER_HPP_
+#define ZOGRASCOPE_TERMHIGHLIGHTER_HPP_
 
 #include <string>
 
@@ -45,4 +45,4 @@ class TermHighlighter : private Highlighter
     ColorScheme cs; // Terminal color scheme.
 };
 
-#endif // ZOGRASCOPE__TERMHIGHLIGHTER_HPP__
+#endif // ZOGRASCOPE_TERMHIGHLIGHTER_HPP_

src/TreeBuilder.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__TREEBUILDER_HPP__
-#define ZOGRASCOPE__TREEBUILDER_HPP__
+#ifndef ZOGRASCOPE_TREEBUILDER_HPP_
+#define ZOGRASCOPE_TREEBUILDER_HPP_
 
 #include <boost/range/adaptor/reversed.hpp>
 
@@ -221,4 +221,4 @@ class TreeBuilder
     bool failed = false;
 };
 
-#endif // ZOGRASCOPE__TREEBUILDER_HPP__
+#endif // ZOGRASCOPE_TREEBUILDER_HPP_

src/align.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__ALIGN_HPP__
-#define ZOGRASCOPE__ALIGN_HPP__
+#ifndef ZOGRASCOPE_ALIGN_HPP_
+#define ZOGRASCOPE_ALIGN_HPP_
 
 #include "utils/strings.hpp"
 
@@ -74,4 +74,4 @@ struct DiffSource
 // Generates alignment information describing two sequences.
 std::vector<DiffLine> makeDiff(DiffSource &&l, DiffSource &&r);
 
-#endif // ZOGRASCOPE__ALIGN_HPP__
+#endif // ZOGRASCOPE_ALIGN_HPP_

src/c/C11Language.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__C__C11LANGUAGE_HPP__
-#define ZOGRASCOPE__C__C11LANGUAGE_HPP__
+#ifndef ZOGRASCOPE_C_C11LANGUAGE_HPP_
+#define ZOGRASCOPE_C_C11LANGUAGE_HPP_
 
 #include <vector>
 
@@ -87,4 +87,4 @@ class C11Language : public Language
     std::vector<Type> map; // Static token-type to Type map.
 };
 
-#endif // ZOGRASCOPE__C__C11LANGUAGE_HPP__
+#endif // ZOGRASCOPE_C_C11LANGUAGE_HPP_

src/c/C11LexerData.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__C__LEXERDATA_HPP__
-#define ZOGRASCOPE__C__LEXERDATA_HPP__
+#ifndef ZOGRASCOPE_C_C11LEXERDATA_HPP_
+#define ZOGRASCOPE_C_C11LEXERDATA_HPP_
 
 #include <cstddef>
 #include <cstring>
@@ -43,4 +43,4 @@ struct C11LexerData : LexerData
     { }
 };
 
-#endif // ZOGRASCOPE__C__LEXERDATA_HPP__
+#endif // ZOGRASCOPE_C_C11LEXERDATA_HPP_

src/c/C11SType.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__C__C11STYPE_HPP__
-#define ZOGRASCOPE__C__C11STYPE_HPP__
+#ifndef ZOGRASCOPE_C_C11STYPE_HPP_
+#define ZOGRASCOPE_C_C11STYPE_HPP_
 
 #include <cstdint>
 
@@ -100,4 +100,4 @@ operator-(SType stype)
 
 }
 
-#endif // ZOGRASCOPE__C__C11STYPE_HPP__
+#endif // ZOGRASCOPE_C_C11STYPE_HPP_

src/change-distilling.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__CHANGE_DISTILLING_HPP__
-#define ZOGRASCOPE__CHANGE_DISTILLING_HPP__
+#ifndef ZOGRASCOPE_CHANGE_DISTILLING_HPP_
+#define ZOGRASCOPE_CHANGE_DISTILLING_HPP_
 
 #include <cstdint>
 
@@ -92,4 +92,4 @@ class Distiller
     std::vector<DiceString> dice2; // DiceString of corresponding po2[i]->label.
 };
 
-#endif // ZOGRASCOPE__CHANGE_DISTILLING_HPP__
+#endif // ZOGRASCOPE_CHANGE_DISTILLING_HPP_

src/colors.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__COLORS_HPP__
-#define ZOGRASCOPE__COLORS_HPP__
+#ifndef ZOGRASCOPE_COLORS_HPP_
+#define ZOGRASCOPE_COLORS_HPP_
 
 enum class ColorGroup
 {
@@ -59,4 +59,4 @@ enum class ColorGroup
     ColorGroupCount
 };
 
-#endif // ZOGRASCOPE__COLORS_HPP__
+#endif // ZOGRASCOPE_COLORS_HPP_

src/compare.hpp

@@ -14,12 +14,12 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__COMPARE_HPP__
-#define ZOGRASCOPE__COMPARE_HPP__
+#ifndef ZOGRASCOPE_COMPARE_HPP_
+#define ZOGRASCOPE_COMPARE_HPP_
 
 class TimeReport;
 class Tree;
 
 void compare(Tree &T1, Tree &T2, TimeReport &tr, bool coarse, bool skipRefine);
 
-#endif // ZOGRASCOPE__COMPARE_HPP__
+#endif // ZOGRASCOPE_COMPARE_HPP_

src/decoration.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__DECORATION_HPP__
-#define ZOGRASCOPE__DECORATION_HPP__
+#ifndef ZOGRASCOPE_DECORATION_HPP_
+#define ZOGRASCOPE_DECORATION_HPP_
 
 #include <functional>
 #include <iosfwd>
@@ -582,4 +582,4 @@ namespace literals {
 
 }
 
-#endif // ZOGRASCOPE__DECORATION_HPP__
+#endif // ZOGRASCOPE_DECORATION_HPP_

src/integration.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__INTEGRATION_HPP__
-#define ZOGRASCOPE__INTEGRATION_HPP__
+#ifndef ZOGRASCOPE_INTEGRATION_HPP_
+#define ZOGRASCOPE_INTEGRATION_HPP_
 
 #include <memory>
 #include <string>
@@ -93,4 +93,4 @@ std::pair<unsigned int, unsigned int> getTerminalSize();
 std::string readCommandOutput(std::vector<std::string> cmd,
                               const std::string &input);
 
-#endif // ZOGRASCOPE__INTEGRATION_HPP__
+#endif // ZOGRASCOPE_INTEGRATION_HPP_

src/make/MakeLanguage.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__MAKE__MAKELANGUAGE_HPP__
-#define ZOGRASCOPE__MAKE__MAKELANGUAGE_HPP__
+#ifndef ZOGRASCOPE_MAKE_MAKELANGUAGE_HPP_
+#define ZOGRASCOPE_MAKE_MAKELANGUAGE_HPP_
 
 #include <vector>
 
@@ -87,4 +87,4 @@ class MakeLanguage : public Language
     std::vector<Type> map; // Static token-type to Type map.
 };
 
-#endif // ZOGRASCOPE__MAKE__MAKELANGUAGE_HPP__
+#endif // ZOGRASCOPE_MAKE_MAKELANGUAGE_HPP_

src/make/MakeLexerData.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__MAKE__MAKELEXERDATA_HPP__
-#define ZOGRASCOPE__MAKE__MAKELEXERDATA_HPP__
+#ifndef ZOGRASCOPE_MAKE_MAKELEXERDATA_HPP_
+#define ZOGRASCOPE_MAKE_MAKELEXERDATA_HPP_
 
 #include <cstddef>
 #include <cstring>
@@ -64,4 +64,4 @@ struct MakeLexerData : LexerData
     { }
 };
 
-#endif // ZOGRASCOPE__MAKE__MAKELEXERDATA_HPP__
+#endif // ZOGRASCOPE_MAKE_MAKELEXERDATA_HPP_

src/make/MakeSType.hpp

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with zograscope.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef ZOGRASCOPE__MAKE__MAKESTYPE_HPP__
-#define ZOGRASCOPE__MAKE__MAKESTYPE_HPP__
+#ifndef ZOGRASCOPE_MAKE_MAKESTYPE_HPP_
+#define ZOGRASCOPE_MAKE_MAKESTYPE_HPP_
 
 #include <cstdint>
 
@@ -64,4 +64,4 @@ operator-(SType stype)
 
 }
 
-#endif // ZOGRASCOPE__MAKE__MAKESTYPE_HPP__
+#endif // ZOGRASCOPE_MAKE_MAKESTYPE_HPP_