Compare commits

...

9 Commits

Author SHA1 Message Date
Beman Dawes
84afa8d62f Release 1.40.0
[SVN r55802]
2009-08-27 16:24:59 +00:00
John Maddock
987080a8c7 Fix up logic and date_time Jamfiles so they build needed dependencies.
Fix PDF image paths in fusion Jamfile.v2.
Add fusion to the PDF build.

[SVN r55757]
2009-08-24 10:31:43 +00:00
Troy D. Straszheim
bd737d03b0 Add basic copyright/license to keep cmake out of the inspection report
[SVN r55095]
2009-07-22 21:51:01 +00:00
John Maddock
58cd700623 Merge PDF build changes from Trunk.
[SVN r51417]
2009-02-23 18:39:32 +00:00
Troy D. Straszheim
951486c794 merge of cmake build files from trunk per beman
[SVN r50756]
2009-01-24 18:57:20 +00:00
Douglas Gregor
f1d8f513bf Merged from trunk
[SVN r42973]
2008-01-25 21:18:27 +00:00
Beman Dawes
9db33f9dcf Full merge from trunk at revision 41356 of entire boost-root tree.
[SVN r41370]
2007-11-25 18:38:02 +00:00
Beman Dawes
02caed268b Full merge from trunk at revision 41356 of entire boost-root tree.
[SVN r41369]
2007-11-25 18:07:19 +00:00
Beman Dawes
5749fb9ef1 Starting point for releases
[SVN r39706]
2007-10-05 14:25:06 +00:00
7 changed files with 54 additions and 5 deletions

27
CMakeLists.txt Normal file
View File

@@ -0,0 +1,27 @@
#
# Copyright Troy D. Straszheim
#
# Distributed under the Boost Software License, Version 1.0.
# See http://www.boost.org/LICENSE_1_0.txt
#
#----------------------------------------------------------------------------
# This file was automatically generated from the original CMakeLists.txt file
# Add a variable to hold the headers for the library
set (lib_headers
logic
)
# Add a library target to the build system
boost_library_project(
logic
# SRCDIRS
TESTDIRS test
HEADERS ${lib_headers}
# DOCDIRS
# DESCRIPTION
MODULARIZED
# AUTHORS
# MAINTAINERS
)

View File

@@ -6,4 +6,10 @@ doxygen reference : [ glob ../../../boost/logic/tribool.hpp ]
[ glob ../../../boost/logic/tribool_fwd.hpp ]
[ glob ../../../boost/logic/tribool_io.hpp ]
;
boostbook tribool : tribool.boostbook ;
boostbook tribool
:
tribool.boostbook
:
<format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
<dependency>reference
;

View File

@@ -2,7 +2,7 @@
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<library name="Tribool" dirname="logic" id="tribool"
last-revision="$Date: 2004/07/25 03:01:38 $" xmlns:xi="http://www.w3.org/2001/XInclude">
last-revision="$Date: 2007/05/03 03:28:53 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<libraryinfo>
<author>
<firstname>Douglas</firstname>
@@ -197,7 +197,7 @@ cout &lt;&lt; boolalpha &lt;&lt; x &lt;&lt; endl; // Prints "maybe"</programlist
</section>
<xi:include href="reference.boostbook"/>
<xi:include href="reference.xml"/>
<testsuite id="tribool.tests">
<run-test filename="tribool_test.cpp">

View File

@@ -336,7 +336,7 @@ inline tribool operator==(tribool x, tribool y)
if (indeterminate(x) || indeterminate(y))
return indeterminate;
else
return x && y || !x && !y;
return (x && y) || (!x && !y);
}
/**
@@ -399,7 +399,7 @@ inline tribool operator!=(tribool x, tribool y)
if (indeterminate(x) || indeterminate(y))
return indeterminate;
else
return !(x && y || !x && !y);
return !((x && y) || (!x && !y));
}
/**

3
module.cmake Normal file
View File

@@ -0,0 +1,3 @@
boost_module(logic DEPENDS config detail)

12
test/CMakeLists.txt Normal file
View File

@@ -0,0 +1,12 @@
#
# Copyright Troy D. Straszheim
#
# Distributed under the Boost Software License, Version 1.0.
# See http://www.boost.org/LICENSE_1_0.txt
#
boost_additional_test_dependencies(logic BOOST_DEPENDS test)
boost_test_run(tribool_test)
boost_test_run(tribool_rename_test)
boost_test_run(tribool_io_test)

View File

@@ -8,6 +8,7 @@
#include <sstream>
#include <string>
#include <iostream>
#include <ios> // for std::boolalpha
#ifndef BOOST_NO_STD_LOCALE
# include <locale>