mirror of
https://github.com/boostorg/config.git
synced 2026-05-05 04:14:12 +02:00
Merge all config diffs from trunk
[SVN r62379]
This commit is contained in:
+33
-5
@@ -9,6 +9,8 @@
|
||||
#define BOOST_CONFIG_SOURCE
|
||||
|
||||
#include "link_test.hpp"
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
|
||||
bool BOOST_CONFIG_DECL check_options(
|
||||
bool m_dyn_link,
|
||||
@@ -17,10 +19,36 @@ bool BOOST_CONFIG_DECL check_options(
|
||||
bool m_debug,
|
||||
bool m_stlp_debug)
|
||||
{
|
||||
return (m_dyn_link == dyn_link)
|
||||
&& (m_dyn_rtl == dyn_rtl)
|
||||
&& (m_has_threads == has_threads)
|
||||
&& (m_debug == debug)
|
||||
&& (m_stlp_debug == stl_debug);
|
||||
if(m_dyn_link != dyn_link)
|
||||
{
|
||||
std::cout << "Dynamic link options do not match" << std::endl;
|
||||
std::cout << "Application setting = " << m_dyn_link << " Library setting = " << dyn_link << std::endl;
|
||||
return false;
|
||||
}
|
||||
if(m_dyn_rtl != dyn_rtl)
|
||||
{
|
||||
std::cout << "Runtime library options do not match" << std::endl;
|
||||
std::cout << "Application setting = " << m_dyn_rtl << " Library setting = " << dyn_rtl << std::endl;
|
||||
return false;
|
||||
}
|
||||
if(m_has_threads != has_threads)
|
||||
{
|
||||
std::cout << "Threading options do not match" << std::endl;
|
||||
std::cout << "Application setting = " << m_has_threads << " Library setting = " << has_threads << std::endl;
|
||||
return false;
|
||||
}
|
||||
if(m_debug != debug)
|
||||
{
|
||||
std::cout << "Debug options do not match" << std::endl;
|
||||
std::cout << "Application setting = " << m_debug << " Library setting = " << debug << std::endl;
|
||||
return false;
|
||||
}
|
||||
if(m_stlp_debug != stl_debug)
|
||||
{
|
||||
std::cout << "STLPort debug options do not match" << std::endl;
|
||||
std::cout << "Application setting = " << m_stlp_debug << " Library setting = " << stl_debug << std::endl;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user