Merge pull request #61 from rdumusc/master

Raphael Dumusc · web-flow · commit 5d81fec92f94 · 2016-06-27T17:04:29.000+02:00
Fix Servus build without boost after #47 (fix #60)
diff --git a/servus/CMakeLists.txt b/servus/CMakeLists.txt
@@ -40,8 +40,7 @@ set(SERVUS_SOURCES
   uri.cpp
   )
 
-list(APPEND SERVUS_LINK_LIBRARIES PRIVATE ${CMAKE_THREAD_LIBS_INIT}
-  ${Boost_REGEX_LIBRARY})
+list(APPEND SERVUS_LINK_LIBRARIES PRIVATE ${CMAKE_THREAD_LIBS_INIT})
 if(MSVC)
   list(APPEND SERVUS_LINK_LIBRARIES ws2_32)
 endif()
@@ -55,6 +54,9 @@ if(COMMON_USE_CXX03)
   list(APPEND SERVUS_LINK_LIBRARIES ${Boost_SYSTEM_LIBRARY}
     ${Boost_CHRONO_LIBRARY})
 endif()
+if(BOOST_FOUND)
+  list(APPEND SERVUS_LINK_LIBRARIES PRIVATE ${Boost_REGEX_LIBRARY})
+endif()
 
 set(SERVUS_OMIT_LIBRARY_HEADER ON)
 common_library(Servus)
diff --git a/servus/uri.cpp b/servus/uri.cpp
@@ -27,7 +27,9 @@
 #include <sstream>
 #include <stdexcept>
 
+#ifdef SERVUS_USE_BOOST
 #include <boost/regex.hpp>
+#endif
 
 namespace servus
 {
@@ -149,21 +151,25 @@ void _parseAuthority( URIData& data, const std::string& auth )
         throw std::invalid_argument("");
 }
 
+#ifdef SERVUS_USE_BOOST
 void _warnAboutLegacySeparator( const std::string& query )
 {
     const boost::regex legacySeparator( "[^&]*,[^&]*=" );
     if( boost::regex_search( query, legacySeparator ))
         std::cerr << "servus::URI: Detected legacy ',' separator in query: \""
                   << query << "\". Use '&' separator instead." << std::endl;
 }
+#endif
 
 void _parseQueryMap( URIData& data )
 {
     // parse query data into key-value pairs
     std::string query = data.query;
 
+#ifdef SERVUS_USE_BOOST
     // warn if a query uses the legacy ',' separator instead of '&'
     _warnAboutLegacySeparator( query );
+#endif
 
     data.queryMap.clear();
     while( !query.empty( ))

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,9 @@`
`27`	`27`	`#include <sstream>`
`28`	`28`	`#include <stdexcept>`
`29`	`29`
	`30`	`+#ifdef SERVUS_USE_BOOST`
`30`	`31`	`#include <boost/regex.hpp>`
	`32`	`+#endif`
`31`	`33`
`32`	`34`	`namespace servus`
`33`	`35`	`{`
`@@ -149,21 +151,25 @@ void _parseAuthority( URIData& data, const std::string& auth )`
`149`	`151`	`throw std::invalid_argument("");`
`150`	`152`	`}`
`151`	`153`
	`154`	`+#ifdef SERVUS_USE_BOOST`
`152`	`155`	`void _warnAboutLegacySeparator( const std::string& query )`
`153`	`156`	`{`
`154`	`157`	`const boost::regex legacySeparator( "[^&],[^&]=" );`
`155`	`158`	`if( boost::regex_search( query, legacySeparator ))`
`156`	`159`	`std::cerr << "servus::URI: Detected legacy ',' separator in query: \""`
`157`	`160`	`<< query << "\". Use '&' separator instead." << std::endl;`
`158`	`161`	`}`
	`162`	`+#endif`
`159`	`163`
`160`	`164`	`void _parseQueryMap( URIData& data )`
`161`	`165`	`{`
`162`	`166`	`// parse query data into key-value pairs`
`163`	`167`	`std::string query = data.query;`
`164`	`168`
	`169`	`+#ifdef SERVUS_USE_BOOST`
`165`	`170`	`// warn if a query uses the legacy ',' separator instead of '&'`
`166`	`171`	`_warnAboutLegacySeparator( query );`
	`172`	`+#endif`
`167`	`173`
`168`	`174`	`data.queryMap.clear();`
`169`	`175`	`while( !query.empty( ))`