update boost to version 1.29.0

[lyx.git] / boost / boost / preprocessor / if.hpp

diff --git a/boost/boost/preprocessor/if.hpp b/boost/boost/preprocessor/if.hpp
index 0ade0993f128012f1c5d0de7a0ca1d922845dc78..78f0cc4967018ddbeddd4b6d89e609a66f011a02 100644 (file)
--- a/boost/boost/preprocessor/if.hpp
+++ b/boost/boost/preprocessor/if.hpp
@@ -1,42 +1,18 @@
-#ifndef BOOST_PREPROCESSOR_IF_HPP
-#define BOOST_PREPROCESSOR_IF_HPP
-
-/* Copyright (C) 2001
- * Housemarque Oy
- * http://www.housemarque.com
- *
- * Permission to copy, use, modify, sell and distribute this software is
- * granted provided this copyright notice appears in all copies. This
- * software is provided "as is" without express or implied warranty, and
- * with no claim as to its suitability for any purpose.
- *
- * See http://www.boost.org for most recent version.
- */
-
-#include <boost/preprocessor/logical/bool.hpp>
-
-/** <p>Expands to <code>THEN</code> if <code>COND != 0</code> and <code>ELSE</code> if
-<code>COND == 0</code>.</p>
-
-<p><code>COND</code> must expand to an integer literal in the range [0, BOOST_PP_LIMIT_MAG].</p>
-
-<p>For example, <code>BOOST_PP_IF(0,1,2)</code> expands to <code>2</code>.</p>
-
-<h3>See</h3>
-<ul>
-  <li>BOOST_PP_EXPR_IF()</li>
-</ul>
-
-<h3>Test</h3>
-<ul>
-  <li><a href="../../test/preprocessor_test.cpp">preprocessor_test.cpp</a></li>
-</ul>
-*/
-#define BOOST_PP_IF(COND,THEN,ELSE) BOOST_PP_IF_BOOL(BOOST_PP_BOOL(COND),ELSE,THEN)
-
-#define BOOST_PP_IF_BOOL(C,E,T) BOOST_PP_IF_BOOL_DELAY(C,E,T)
-#define BOOST_PP_IF_BOOL_DELAY(C,E,T) BOOST_PP_IF##C(E,T)
-
-#define BOOST_PP_IF0(E,T) E
-#define BOOST_PP_IF1(E,T) T
-#endif
+# /* **************************************************************************
+#  *                                                                          *
+#  *     (C) Copyright Paul Mensonides 2002.  Permission to copy, use,        *
+#  *     modify, sell, and distribute this software is granted provided       *
+#  *     this copyright notice appears in all copies.  This software is       *
+#  *     provided "as is" without express or implied warranty, and with       *
+#  *     no claim at to its suitability for any purpose.                      *
+#  *                                                                          *
+#  ************************************************************************** */
+#
+# /* See http://www.boost.org for most recent version. */
+#
+# ifndef BOOST_PREPROCESSOR_IF_HPP
+# define BOOST_PREPROCESSOR_IF_HPP
+#
+# include <boost/preprocessor/control/if.hpp>
+#
+# endif