Fix #926 Custom CppMicroServices Boost Namespace (#929)

Signed-off-by: tcormack <tcormack@mathworks.com>

compendium/ConfigurationAdmin/src/CMAsyncWorkService.cpp

@@ -51,7 +51,7 @@ namespace cppmicroservices
             void
             Initialize()
             {
-                threadpool = std::make_shared<boost::asio::thread_pool>(1);
+                threadpool = std::make_shared<cppmsboost::asio::thread_pool>(1);
             }
 
             void
@@ -84,18 +84,18 @@ namespace cppmicroservices
                 if (threadpool)
                 {
                     using Sig = void();
-                    using Result = boost::asio::async_result<decltype(task), Sig>;
+                    using Result = cppmsboost::asio::async_result<decltype(task), Sig>;
                     using Handler = typename Result::completion_handler_type;
 
                     Handler handler(std::forward<decltype(task)>(task));
 
-                    boost::asio::post(threadpool->get_executor(),
+                    cppmsboost::asio::post(threadpool->get_executor(),
                                       [handler = std::move(handler)]() mutable { handler(); });
                 }
             }
 
           private:
-            std::shared_ptr<boost::asio::thread_pool> threadpool;
+            std::shared_ptr<cppmsboost::asio::thread_pool> threadpool;
             std::shared_ptr<cppmicroservices::logservice::LogService> logger;
         };
 

compendium/ConfigurationAdmin/test/TestAsyncWorkService.cpp

@@ -176,7 +176,7 @@ namespace test
       public:
         AsyncWorkServiceThreadPool(int nThreads) : cppmicroservices::async::AsyncWorkService()
         {
-            threadpool = std::make_shared<boost::asio::thread_pool>(nThreads);
+            threadpool = std::make_shared<cppmsboost::asio::thread_pool>(nThreads);
         }
 
         ~AsyncWorkServiceThreadPool() override
@@ -205,17 +205,17 @@ namespace test
         post(std::packaged_task<void()>&& task) override
         {
             using Sig = void();
-            using Result = boost::asio::async_result<decltype(task), Sig>;
+            using Result = cppmsboost::asio::async_result<decltype(task), Sig>;
             using Handler = typename Result::completion_handler_type;
 
             Handler handler(std::forward<decltype(task)>(task));
             Result result(handler);
 
-            boost::asio::post(threadpool->get_executor(), [handler = std::move(handler)]() mutable { handler(); });
+            cppmsboost::asio::post(threadpool->get_executor(), [handler = std::move(handler)]() mutable { handler(); });
         }
 
       private:
-        std::shared_ptr<boost::asio::thread_pool> threadpool;
+        std::shared_ptr<cppmsboost::asio::thread_pool> threadpool;
     };
 
     TEST_F(tGenericDSAndCASuite, TestAsyncWorkServiceWithoutUserService)

compendium/DeclarativeServices/src/SCRAsyncWorkService.cpp

@@ -51,7 +51,7 @@ namespace cppmicroservices
             void
             Initialize()
             {
-                threadpool = std::make_shared<boost::asio::thread_pool>(2);
+                threadpool = std::make_shared<cppmsboost::asio::thread_pool>(2);
             }
 
             void
@@ -84,18 +84,18 @@ namespace cppmicroservices
                 if (threadpool)
                 {
                     using Sig = void();
-                    using Result = boost::asio::async_result<decltype(task), Sig>;
+                    using Result = cppmsboost::asio::async_result<decltype(task), Sig>;
                     using Handler = typename Result::completion_handler_type;
 
                     Handler handler(std::forward<decltype(task)>(task));
 
-                    boost::asio::post(threadpool->get_executor(),
+                    cppmsboost::asio::post(threadpool->get_executor(),
                                       [handler = std::move(handler)]() mutable { handler(); });
                 }
             }
 
           private:
-            std::shared_ptr<boost::asio::thread_pool> threadpool;
+            std::shared_ptr<cppmsboost::asio::thread_pool> threadpool;
             std::shared_ptr<cppmicroservices::logservice::LogService> logger;
         };
 

compendium/DeclarativeServices/test/gtest/TestAsyncWorkService.cpp

@@ -110,7 +110,7 @@ namespace test
       public:
         AsyncWorkServiceThreadPool(int nThreads) : cppmicroservices::async::AsyncWorkService()
         {
-            threadpool = std::make_shared<boost::asio::thread_pool>(nThreads);
+            threadpool = std::make_shared<cppmsboost::asio::thread_pool>(nThreads);
         }
 
         ~AsyncWorkServiceThreadPool() override
@@ -139,17 +139,17 @@ namespace test
         post(std::packaged_task<void()>&& task) override
         {
             using Sig = void();
-            using Result = boost::asio::async_result<decltype(task), Sig>;
+            using Result = cppmsboost::asio::async_result<decltype(task), Sig>;
             using Handler = typename Result::completion_handler_type;
 
             Handler handler(std::forward<decltype(task)>(task));
             Result result(handler);
 
-            boost::asio::post(threadpool->get_executor(), [handler = std::move(handler)]() mutable { handler(); });
+            cppmsboost::asio::post(threadpool->get_executor(), [handler = std::move(handler)]() mutable { handler(); });
         }
 
       private:
-        std::shared_ptr<boost::asio::thread_pool> threadpool;
+        std::shared_ptr<cppmsboost::asio::thread_pool> threadpool;
     };
 
     TEST_F(tGenericDSSuite, TestAsyncWorkServiceWithoutUserService)

third_party/boost/include/boost/algorithm/string/case_conv.hpp

@@ -29,7 +29,7 @@
     desired case using provided locales.
 */
 
-namespace boost {
+namespace cppmsboost {
     namespace algorithm {
 
 //  to_lower  -----------------------------------------------//
@@ -57,10 +57,10 @@ namespace boost {
             const RangeT& Input,
             const std::locale& Loc=std::locale())
         {
-            return ::boost::algorithm::detail::transform_range_copy( 
+            return ::cppmsboost::algorithm::detail::transform_range_copy( 
                Output,
-               ::boost::as_literal(Input),
-               ::boost::algorithm::detail::to_lowerF<
+               ::cppmsboost::as_literal(Input),
+               ::cppmsboost::algorithm::detail::to_lowerF<
                     typename range_value<RangeT>::type >(Loc));
         }
 
@@ -73,9 +73,9 @@ namespace boost {
             const SequenceT& Input, 
             const std::locale& Loc=std::locale())
         {
-            return ::boost::algorithm::detail::transform_range_copy<SequenceT>(
+            return ::cppmsboost::algorithm::detail::transform_range_copy<SequenceT>(
                 Input,
-                ::boost::algorithm::detail::to_lowerF<
+                ::cppmsboost::algorithm::detail::to_lowerF<
                     typename range_value<SequenceT>::type >(Loc));
         }
 
@@ -92,9 +92,9 @@ namespace boost {
             WritableRangeT& Input, 
             const std::locale& Loc=std::locale())
         {
-            ::boost::algorithm::detail::transform_range(
-                ::boost::as_literal(Input),
-                ::boost::algorithm::detail::to_lowerF<
+            ::cppmsboost::algorithm::detail::transform_range(
+                ::cppmsboost::as_literal(Input),
+                ::cppmsboost::algorithm::detail::to_lowerF<
                     typename range_value<WritableRangeT>::type >(Loc));
         }
 
@@ -122,10 +122,10 @@ namespace boost {
             const RangeT& Input,
             const std::locale& Loc=std::locale())
         {
-            return ::boost::algorithm::detail::transform_range_copy( 
+            return ::cppmsboost::algorithm::detail::transform_range_copy( 
                Output,
-               ::boost::as_literal(Input),
-               ::boost::algorithm::detail::to_upperF<
+               ::cppmsboost::as_literal(Input),
+               ::cppmsboost::algorithm::detail::to_upperF<
                     typename range_value<RangeT>::type >(Loc));
         }
 
@@ -138,9 +138,9 @@ namespace boost {
             const SequenceT& Input, 
             const std::locale& Loc=std::locale())
         {
-            return ::boost::algorithm::detail::transform_range_copy<SequenceT>(
+            return ::cppmsboost::algorithm::detail::transform_range_copy<SequenceT>(
                 Input,
-                ::boost::algorithm::detail::to_upperF<
+                ::cppmsboost::algorithm::detail::to_upperF<
                     typename range_value<SequenceT>::type >(Loc));
         }
 
@@ -157,9 +157,9 @@ namespace boost {
             WritableRangeT& Input, 
             const std::locale& Loc=std::locale())
         {
-            ::boost::algorithm::detail::transform_range(
-                ::boost::as_literal(Input),
-                ::boost::algorithm::detail::to_upperF<
+            ::cppmsboost::algorithm::detail::transform_range(
+                ::cppmsboost::as_literal(Input),
+                ::cppmsboost::algorithm::detail::to_upperF<
                     typename range_value<WritableRangeT>::type >(Loc));
         }
 
@@ -171,6 +171,6 @@ namespace boost {
     using algorithm::to_upper;
     using algorithm::to_upper_copy;
 
-} // namespace boost
+} // namespace cppmsboost
 
 #endif  // BOOST_STRING_CASE_CONV_HPP

third_party/boost/include/boost/algorithm/string/classification.hpp

@@ -26,7 +26,7 @@
     into generic functors. 
 */
 
-namespace boost {
+namespace cppmsboost {
     namespace algorithm {
 
 //  classification functor generator -------------------------------------//
@@ -202,7 +202,7 @@ namespace boost {
             BOOST_STRING_TYPENAME range_value<RangeT>::type> 
         is_any_of( const RangeT& Set )
         {
-            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_set(boost::as_literal(Set));
+            iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_set(cppmsboost::as_literal(Set));
             return detail::is_any_ofF<BOOST_STRING_TYPENAME range_value<RangeT>::type>(lit_set); 
         }
 
@@ -307,6 +307,6 @@ namespace boost {
     using algorithm::is_any_of;
     using algorithm::is_from_range;
 
-} // namespace boost
+} // namespace cppmsboost
 
 #endif  // BOOST_STRING_PREDICATE_HPP

third_party/boost/include/boost/algorithm/string/compare.hpp

@@ -21,7 +21,7 @@
     of the algorithms.
 */
 
-namespace boost {
+namespace cppmsboost {
     namespace algorithm {
 
         //  is_equal functor  -----------------------------------------------//
@@ -193,7 +193,7 @@ namespace boost {
     using algorithm::is_not_greater;
     using algorithm::is_not_igreater;
 
-} // namespace boost
+} // namespace cppmsboost
 
 
 #endif  // BOOST_STRING_COMPARE_HPP

third_party/boost/include/boost/algorithm/string/concept.hpp

@@ -20,7 +20,7 @@
     Defines concepts used in string_algo library
 */
 
-namespace boost {
+namespace cppmsboost {
     namespace algorithm {
 
         //! Finder concept
@@ -65,8 +65,8 @@ namespace boost {
             void constraints()
             {
                 // Operation
-                ::boost::begin((*pFo)( (*pF)(i,i) ));
-                ::boost::end((*pFo)( (*pF)(i,i) ));
+                ::cppmsboost::begin((*pFo)( (*pF)(i,i) ));
+                ::cppmsboost::end((*pFo)( (*pF)(i,i) ));
             }
         private:
             IteratorT i;
@@ -75,7 +75,7 @@ namespace boost {
         }; // FormatterConcept;
 
     } // namespace algorithm
-} // namespace boost
+} // namespace cppmsboost
 
 
 

third_party/boost/include/boost/algorithm/string/constants.hpp

@@ -11,7 +11,7 @@
 #ifndef BOOST_STRING_CONSTANTS_HPP
 #define BOOST_STRING_CONSTANTS_HPP
 
-namespace boost {
+namespace cppmsboost {
     namespace algorithm {
 
     //! Token compression mode 
@@ -30,7 +30,7 @@ namespace boost {
     using algorithm::token_compress_on;
     using algorithm::token_compress_off;
 
-} // namespace boost
+} // namespace cppmsboost
 
 #endif  // BOOST_STRING_CONSTANTS_HPP
 

third_party/boost/include/boost/algorithm/string/detail/case_conv.hpp

@@ -17,7 +17,7 @@
 
 #include <boost/type_traits/make_unsigned.hpp>
 
-namespace boost {
+namespace cppmsboost {
     namespace algorithm {
         namespace detail {
 
@@ -41,7 +41,7 @@ namespace boost {
                 CharT operator ()( CharT Ch ) const
                 {
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
-                        return std::tolower( static_cast<typename boost::make_unsigned <CharT>::type> ( Ch ));
+                        return std::tolower( static_cast<typename cppmsboost::make_unsigned <CharT>::type> ( Ch ));
                     #else
                         return std::tolower<CharT>( Ch, *m_Loc );
                     #endif
@@ -63,7 +63,7 @@ namespace boost {
                 CharT operator ()( CharT Ch ) const
                 {
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
-                        return std::toupper( static_cast<typename boost::make_unsigned <CharT>::type> ( Ch ));
+                        return std::toupper( static_cast<typename cppmsboost::make_unsigned <CharT>::type> ( Ch ));
                     #else
                         return std::toupper<CharT>( Ch, *m_Loc );
                     #endif
@@ -86,8 +86,8 @@ namespace boost {
                 FunctorT Functor)
             {
                 return std::transform( 
-                    ::boost::begin(Input), 
-                    ::boost::end(Input), 
+                    ::cppmsboost::begin(Input), 
+                    ::cppmsboost::end(Input), 
                     Output,
                     Functor);
             }
@@ -99,9 +99,9 @@ namespace boost {
                 FunctorT Functor)
             {
                 std::transform( 
-                    ::boost::begin(Input), 
-                    ::boost::end(Input), 
-                    ::boost::begin(Input),
+                    ::cppmsboost::begin(Input), 
+                    ::cppmsboost::end(Input), 
+                    ::cppmsboost::begin(Input),
                     Functor);
             }
 
@@ -111,17 +111,17 @@ namespace boost {
                 FunctorT Functor)
             {
                 return SequenceT(
-                    ::boost::make_transform_iterator(
-                        ::boost::begin(Input),
+                    ::cppmsboost::make_transform_iterator(
+                        ::cppmsboost::begin(Input),
                         Functor),
-                    ::boost::make_transform_iterator(
-                        ::boost::end(Input), 
+                    ::cppmsboost::make_transform_iterator(
+                        ::cppmsboost::end(Input), 
                         Functor));
             }
 
         } // namespace detail
     } // namespace algorithm
-} // namespace boost
+} // namespace cppmsboost
 
 
 #endif  // BOOST_STRING_CASE_CONV_DETAIL_HPP