6 files changed, 15 insertions, 15 deletions
diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.hpp
index 49f424949..f8d23b7a2 100644
--- a/indexlib/boost-compat/config/abi/borland_prefix.hpp
+++ b/indexlib/boost-compat/config/abi/borland_prefix.hpp
@@ -8,11 +8,11 @@
 //  -b (on or off - effect emum sizes)
 //  -Vx  (on or off - empty members)
 //  -Ve (on or off - empty base classes)
-//  -aX (alignment - 5 options).
+//  -aX (tqalignment - 5 options).
 //  -pX (Calling convention - 4 options)
-//  -VmX (member pointer size and layout - 5 options)
+//  -VmX (member pointer size and tqlayout - 5 options)
 //  -VC (on or off, changes name mangling)
-//  -Vl (on or off, changes struct layout).
+//  -Vl (on or off, changes struct tqlayout).
 
 //  In addition the following warnings are sufficiently annoying (and
 //  unfixable) to have them turned off by default:
diff --git a/indexlib/boost-compat/config/auto_link.hpp b/indexlib/boost-compat/config/auto_link.hpp
index b4e580ffa..9723a18f8 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,
-                      contains one or more of the following letters after
+                      tqcontains 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 3a5f41303..4893faaa4 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 replace MP-unsafe
+// The MP task implementation of Boost Threads aims to tqreplace MP-unsafe
 // parts of the MSL, so we turn on threads unconditionally.
 #    define BOOST_HAS_THREADS
 
diff --git a/indexlib/boost-compat/config/select_stdlib_config.hpp b/indexlib/boost-compat/config/select_stdlib_config.hpp
index b7bf59143..735a03b0b 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 replacement libraries):
+// Dinkumware Library (this has to appear after any possible tqreplacement 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 77d9decac..a144b4feb 100644
--- a/indexlib/boost-compat/config/suffix.hpp
+++ b/indexlib/boost-compat/config/suffix.hpp
@@ -332,7 +332,7 @@ namespace std {
 // The same problem occurs with has_facet.
 // These macros provide a consistent way to access a locale's facets.
 // Usage:
-//    replace
+//    tqreplace
 //       std::use_facet<Type>(loc);
 //    with
 //       BOOST_USE_FACET(Type, loc);
@@ -357,7 +357,7 @@ namespace std {
 
 // BOOST_NESTED_TEMPLATE workaround ------------------------------------------//
 // Member templates are supported by some compilers even though they can't use
-// the A::template member<U> syntax, as a workaround replace:
+// the A::template member<U> syntax, as a workaround tqreplace:
 //
 // typedef typename A::template rebind<U> binder;
 //
@@ -500,7 +500,7 @@ namespace boost{
 
 //
 // Helper macro BOOST_STRINGIZE:
-// Converts the parameter X to a string after macro replacement
+// Converts the parameter X to a string after macro tqreplacement
 // 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 5a4a9d477..d595f997b 100644
--- a/indexlib/boost-compat/config/user.hpp
+++ b/indexlib/boost-compat/config/user.hpp
@@ -67,16 +67,16 @@
 
 // BOOST_DISABLE_ABI_HEADERS: Stops boost headers from including any 
 // prefix/suffix headers that normally control things like struct 
-// packing and alignment. 
+// packing and tqalignment. 
 // #define BOOST_DISABLE_ABI_HEADERS
 
 // BOOST_ABI_PREFIX: A prefix header to include in place of whatever
-// boost.config would normally select, any replacement should set up 
-// struct packing and alignment options as required. 
+// boost.config would normally select, any tqreplacement 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 replacement should undo 
+// boost.config would normally select, any tqreplacement 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: replace the WHATEVER 
+// rather than a static library on Microsoft Windows: tqreplace 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", 
-// replace WHATEVER in the macro name with the name of the library; 
+// tqreplace 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