Don't allow newline characters in document settings.

[lyx.git] / boost / boost / cregex.hpp

diff --git a/boost/boost/cregex.hpp b/boost/boost/cregex.hpp
index e35a6c36edb9839bd31392663e5426504d195270..b7a918eb8edd367b2fb498f6b5d629578068ac17 100644 (file)
--- a/boost/boost/cregex.hpp
+++ b/boost/boost/cregex.hpp
@@ -1,15 +1,11 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Dr John Maddock makes no representations
- * about the suitability of this software for any purpose.  
- * It is provided "as is" without express or implied warranty.
+ * Use, modification and distribution are subject to the 
+ * Boost Software License, Version 1.0. (See accompanying file 
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
  
@@ -24,9 +20,15 @@
 #ifndef BOOST_RE_CREGEX_HPP
 #define BOOST_RE_CREGEX_HPP
 
-#include <boost/regex/v3/cregex.hpp>
+#ifndef BOOST_REGEX_CONFIG_HPP
+#include <boost/regex/config.hpp>
+#endif
+
+#include <boost/regex/v4/cregex.hpp>
+
+#endif /* include guard */
+
 
-#endif // include guard