summaryrefslogtreecommitdiffstats
path: root/indexlib/boost-compat/config
diff options
context:
space:
mode:
Diffstat (limited to 'indexlib/boost-compat/config')
-rw-r--r--indexlib/boost-compat/config/auto_link.hpp2
-rw-r--r--indexlib/boost-compat/config/platform/macos.hpp2
-rw-r--r--indexlib/boost-compat/config/requires_threads.hpp6
-rw-r--r--indexlib/boost-compat/config/select_stdlib_config.hpp2
-rw-r--r--indexlib/boost-compat/config/suffix.hpp2
-rw-r--r--indexlib/boost-compat/config/user.hpp8
6 files changed, 11 insertions, 11 deletions
diff --git a/indexlib/boost-compat/config/auto_link.hpp b/indexlib/boost-compat/config/auto_link.hpp
index 9723a18f8..b4e580ffa 100644
--- a/indexlib/boost-compat/config/auto_link.hpp
+++ b/indexlib/boost-compat/config/auto_link.hpp
@@ -53,7 +53,7 @@ BOOST_LIB_TOOLSET: The compiler toolset name (vc6, vc7, bcb5 etc).
BOOST_LIB_THREAD_OPT: "-mt" for multithread builds, otherwise nothing.
BOOST_LIB_RT_OPT: A suffix that indicates the runtime library used,
- tqcontains one or more of the following letters after
+ contains one or more of the following letters after
a hiphen:
s static runtime (dynamic if not present).
diff --git a/indexlib/boost-compat/config/platform/macos.hpp b/indexlib/boost-compat/config/platform/macos.hpp
index 4893faaa4..3a5f41303 100644
--- a/indexlib/boost-compat/config/platform/macos.hpp
+++ b/indexlib/boost-compat/config/platform/macos.hpp
@@ -53,7 +53,7 @@
# define BOOST_HAS_MPTASKS
-// The MP task implementation of Boost Threads aims to tqreplace MP-unsafe
+// The MP task implementation of Boost Threads aims to replace MP-unsafe
// parts of the MSL, so we turn on threads unconditionally.
# define BOOST_HAS_THREADS
diff --git a/indexlib/boost-compat/config/requires_threads.hpp b/indexlib/boost-compat/config/requires_threads.hpp
index cfaff2302..d8a357779 100644
--- a/indexlib/boost-compat/config/requires_threads.hpp
+++ b/indexlib/boost-compat/config/requires_threads.hpp
@@ -4,8 +4,8 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_CONFIG_REQUIRES_THREADS_HPP
-#define BOOST_CONFIG_REQUIRES_THREADS_HPP
+#ifndef BOOST_CONFIG_RETQUIRES_THREADS_HPP
+#define BOOST_CONFIG_RETQUIRES_THREADS_HPP
#ifndef BOOST_CONFIG_HPP
# include <boost/config.hpp>
@@ -89,4 +89,4 @@
#endif // BOOST_HAS_THREADS
-#endif // BOOST_CONFIG_REQUIRES_THREADS_HPP
+#endif // BOOST_CONFIG_RETQUIRES_THREADS_HPP
diff --git a/indexlib/boost-compat/config/select_stdlib_config.hpp b/indexlib/boost-compat/config/select_stdlib_config.hpp
index 735a03b0b..b7bf59143 100644
--- a/indexlib/boost-compat/config/select_stdlib_config.hpp
+++ b/indexlib/boost-compat/config/select_stdlib_config.hpp
@@ -54,7 +54,7 @@
# define BOOST_STDLIB_CONFIG "boost/config/stdlib/modena.hpp"
#elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-// Dinkumware Library (this has to appear after any possible tqreplacement libraries):
+// Dinkumware Library (this has to appear after any possible replacement libraries):
# define BOOST_STDLIB_CONFIG "boost/config/stdlib/dinkumware.hpp"
#elif defined (BOOST_ASSERT_CONFIG)
diff --git a/indexlib/boost-compat/config/suffix.hpp b/indexlib/boost-compat/config/suffix.hpp
index a144b4feb..3d60d7181 100644
--- a/indexlib/boost-compat/config/suffix.hpp
+++ b/indexlib/boost-compat/config/suffix.hpp
@@ -500,7 +500,7 @@ namespace boost{
//
// Helper macro BOOST_STRINGIZE:
-// Converts the parameter X to a string after macro tqreplacement
+// Converts the parameter X to a string after macro replacement
// on X has been performed.
//
#define BOOST_STRINGIZE(X) BOOST_DO_STRINGIZE(X)
diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.hpp
index d595f997b..c83e9af6b 100644
--- a/indexlib/boost-compat/config/user.hpp
+++ b/indexlib/boost-compat/config/user.hpp
@@ -71,12 +71,12 @@
// #define BOOST_DISABLE_ABI_HEADERS
// BOOST_ABI_PREFIX: A prefix header to include in place of whatever
-// boost.config would normally select, any tqreplacement should set up
+// boost.config would normally select, any replacement should set up
// struct packing and tqalignment options as required.
// #define BOOST_ABI_PREFIX my-header-name
// BOOST_ABI_SUFFIX: A suffix header to include in place of whatever
-// boost.config would normally select, any tqreplacement should undo
+// boost.config would normally select, any replacement should undo
// the effects of the prefix header.
// #define BOOST_ABI_SUFFIX my-header-name
@@ -91,7 +91,7 @@
// #define BOOST_ALL_DYN_LINK
// BOOST_WHATEVER_DYN_LINK: Forces library "whatever" to be linked as a dll
-// rather than a static library on Microsoft Windows: tqreplace the WHATEVER
+// rather than a static library on Microsoft Windows: replace the WHATEVER
// part of the macro name with the name of the library that you want to
// dynamically link to, for example use BOOST_DATE_TIME_DYN_LINK or
// BOOST_REGEX_DYN_LINK etc (this macro is used to turn on __declspec(dllimport)
@@ -112,7 +112,7 @@
// BOOST_WHATEVER_NO_LIB: Tells the config system not to automatically
// select which library to link against for library "whatever",
-// tqreplace WHATEVER in the macro name with the name of the library;
+// replace WHATEVER in the macro name with the name of the library;
// for example BOOST_DATE_TIME_NO_LIB or BOOST_REGEX_NO_LIB.
// Normally if a compiler supports #pragma lib, then the correct library
// build variant will be automatically selected and linked against, simply