Merge pull request #10 from brunocodutra/develop

merge develop
brunocodutra · Apr 11, 2016 · ecadcd3 · ecadcd3
2 parents 85b72e4 + 49533d3
commit ecadcd3
Show file tree

Hide file tree

Showing 58 changed files with 810 additions and 297 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -83,7 +83,7 @@ install:
   - |
     if [[ "${BUILD_DOC}" == "true" ]]
     then
-        DOXYGEN_URL="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.10.linux.bin.tar.gz"
+        DOXYGEN_URL="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.11.linux.bin.tar.gz"
         mkdir "${DEPS_PATH}/doxygen" &&
         travis_retry wget --quiet -O - ${DOXYGEN_URL} | tar --strip-components=1 -xz -C "${DEPS_PATH}/doxygen" &&
         export PATH=${DEPS_PATH}/doxygen/bin:${PATH}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,10 +94,6 @@ endif()
 
 if(METAL_ENABLE_EXTRA_WARNINGS)
     metal_add_flag(-Wextra)
-    metal_add_flag(-Weverything)
-    metal_add_flag(-Wno-c++98-compat)
-    metal_add_flag(-Wno-c++98-compat-pedantic)
-    metal_add_flag(-Wno-documentation-unknown-command)
     metal_add_flag(/W4)
 endif()
 
@@ -107,8 +103,6 @@ if(METAL_STRICT)
     metal_add_flag(/WX)
 endif()
 
-metal_add_flag(-ftemplate-depth=512)
-
 foreach(dialect
     -std=c++17 -std=c++1z
     -std=c++14 -std=c++1y

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -228,6 +228,8 @@ TAB_SIZE               = 4
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines.
 
+ALIASES += strike{1}="<div class=\"strike\">\1</div>"
+
 ALIASES +=value="\ref concepts_value"
 ALIASES +=values="\ref concepts_value \"Values\""
 ALIASES +=optional="\ref concepts_optional"

diff --git a/doc/css/metal.css b/doc/css/metal.css
@@ -129,6 +129,10 @@ span.octicon {
     margin-right: 5px;
 }
 
+.strike {
+    text-decoration: line-through;
+}
+
 #footer {
     height: 100px;
     font-size: 0.9em;