From c19d914ce6be56f651b86d7535ecdabcb06c73bb Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 24 Mar 2017 15:32:15 +0100
Subject: [PATCH] Merge branch 'fix/guardian-macro' into 'master'

[constraintsolvers] Fix guardian macro

See merge request !435
---
 dumux/material/constraintsolvers/miscible2pnccomposition.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dumux/material/constraintsolvers/miscible2pnccomposition.hh b/dumux/material/constraintsolvers/miscible2pnccomposition.hh
index e281c2f289..167a47b8fd 100644
--- a/dumux/material/constraintsolvers/miscible2pnccomposition.hh
+++ b/dumux/material/constraintsolvers/miscible2pnccomposition.hh
@@ -23,8 +23,8 @@
  *        N-component fluid system assuming that all N phases are
  *        present
  */
-#ifndef DUMUX_MISCIBLE_MULTIPHASE_COMPOSITION_HH
-#define DUMUX_MISCIBLE_MULTIPHASE_COMPOSITION_HH
+#ifndef DUMUX_MISCIBLE_TWOPNC_COMPOSITION_HH
+#define DUMUX_MISCIBLE_TWOPNC_COMPOSITION_HH
 
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
-- 
GitLab