feedc0de/boost_system
1
0
Fork 0
forked from boostorg/system
Code Pull Requests Activity

Merge branch 'develop'

Browse Source 
Conflicts:
	doc/reference.html
	include/boost/system/error_code.hpp
	test/system/error_code_test/error_code_test.vcxproj
	test/system/system-dll/system-dll.vcxproj
	test/system_msvc/system_msvc.sln
This commit is contained in:
Beman
2014-06-02 08:14:58 -04:00
parent 85ba824b37 4b7573fd43
commit 5a29c4458d
15 changed files with 819 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/system/error_code.hpp
+1 -2
View File
@@ -14,7 +14,6 @@
#include <boost/system/config.hpp>
#include <boost/cstdint.hpp>
#include <boost/assert.hpp>
#include <boost/operators.hpp>
#include <boost/noncopyable.hpp>
#include <boost/utility/enable_if.hpp>
#include <ostream>
@@ -513,7 +512,7 @@ namespace boost
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
# ifdef BOOST_ERROR_CODE_HEADER_ONLY
# include <boost/../libs/system/src/error_code.cpp>
# include <boost/system/detail/error_code.ipp>
# endif
#endif // BOOST_ERROR_CODE_HPP