From 239043824dd8da291ffc20f879ee02c4157d11e6 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Wed, 18 Apr 2012 16:23:04 +0000
Subject: [PATCH] deprecated.hh: only define symbols if they have not been
 defined before

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8084 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
 dumux/common/deprecated.hh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dumux/common/deprecated.hh b/dumux/common/deprecated.hh
index f200f6e89f..77573c0ca9 100644
--- a/dumux/common/deprecated.hh
+++ b/dumux/common/deprecated.hh
@@ -31,18 +31,22 @@
 #ifndef DUMUX_DEPRECATED_HH
 #define DUMUX_DEPRECATED_HH
 
+#ifndef DUMUX_DEPRECATED
 #if defined(DOXYGEN) || !HAVE_ATTRIBUTE_DEPRECATED
 //! Mark some entity as deprecated
 #define DUMUX_DEPRECATED
 #else
 #define DUMUX_DEPRECATED __attribute__((deprecated))
 #endif
+#endif
 
+#ifndef DUMUX_DEPRECATED_MSG
 #if defined(DOXYGEN) || !HAVE_ATTRIBUTE_DEPRECATED_MSG
 //! Mark some entity as deprecated
 #define DUMUX_DEPRECATED_MSG(text) DUMUX_DEPRECATED
 #else
 #define DUMUX_DEPRECATED_MSG(text) __attribute__((deprecated(text)))
 #endif
+#endif
 
 #endif
-- 
GitLab