Don't allow newline characters in document settings.

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

diff --git a/boost/boost/regex.h b/boost/boost/regex.h
index 79af8ba852dcfeeffc99d7473e79a59f507d3e93..52af275cfa2f85a30ebac0ee7907c3aafeb7987f 100644 (file)
--- a/boost/boost/regex.h
+++ b/boost/boost/regex.h
@@ -3,20 +3,16 @@
  * Copyright (c) 1998-2000
  * Dr 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)
  *
  */
  
  /*
-  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   LOCATION:    see http://www.boost.org/libs/regex for documentation.
   *   FILE         regex.h
-  *   VERSION      3.03
+  *   VERSION      3.12
   *   DESCRIPTION: Declares POSIX API functions
   */
 
@@ -25,10 +21,10 @@
 
 #include <boost/cregex.hpp>
 
-//
-// add using declarations to bring POSIX API functions into
-// global scope, only if this is C++ (and not C).
-//
+/*
+*  add using declarations to bring POSIX API functions into
+* global scope, only if this is C++ (and not C).
+*/
 #ifdef __cplusplus
 
 using boost::regoff_t;
@@ -65,7 +61,7 @@ using boost::regerrorA;
 using boost::regexecA;
 using boost::regfreeA;
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 using boost::regcompW;
 using boost::regerrorW;
 using boost::regexecW;
@@ -95,8 +91,10 @@ using boost::REG_E_MEMORY;
 using boost::REG_E_UNKNOWN;
 using boost::reg_errcode_t;
 
-#endif // __cplusplus
+#endif /* __cplusplus */
+
+#endif /* BOOST_RE_REGEX_H */
+
 
-#endif // BOOST_RE_REGEX_H