Don't allow newline characters in document settings.

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

diff --git a/boost/boost/regex.hpp b/boost/boost/regex.hpp
index b5227e45c67e79b4e5a6a222247dbb0145275eea..6dc3dfbd427ec293747b98509264ab70eff8b490 100644 (file)
--- a/boost/boost/regex.hpp
+++ b/boost/boost/regex.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)
  *
  */
 
@@ -17,7 +13,7 @@
   *   LOCATION:    see http://www.boost.org/libs/regex for documentation.
   *   FILE         regex.cpp
   *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Declares boost::reg_expression<> and associated
+  *   DESCRIPTION: Declares boost::basic_regex<> and associated
   *                functions and classes. This header is the main
   *                entry point for the template regex code.
   */
@@ -28,8 +24,14 @@
 #ifndef BOOST_RE_REGEX_HPP
 #define BOOST_RE_REGEX_HPP
 
-#include <boost/regex/v3/regex.hpp>
+#ifndef BOOST_REGEX_CONFIG_HPP
+#include <boost/regex/config.hpp>
+#endif
+
+#include <boost/regex/v4/regex.hpp>
 
 #endif  // include
 
 
+
+