Compare commits

...

9 Commits

Author SHA1 Message Date
e89b3341e6 Release 1.37.0
[SVN r51178]
2009-02-10 13:14:42 +00:00
951486c794 merge of cmake build files from trunk per beman
[SVN r50756]
2009-01-24 18:57:20 +00:00
f1d8f513bf Merged from trunk
[SVN r42973]
2008-01-25 21:18:27 +00:00
9db33f9dcf Full merge from trunk at revision 41356 of entire boost-root tree.
[SVN r41370]
2007-11-25 18:38:02 +00:00
02caed268b Full merge from trunk at revision 41356 of entire boost-root tree.
[SVN r41369]
2007-11-25 18:07:19 +00:00
5749fb9ef1 Starting point for releases
[SVN r39706]
2007-10-05 14:25:06 +00:00
03a2600bf5 This commit was manufactured by cvs2svn to create tag
'Version_1_34_1'.

[SVN r38286]
2007-07-24 19:28:14 +00:00
9e9489c7bd Remove obsolete Boost.Build v1 files.
[SVN r35880]
2006-11-06 17:10:46 +00:00
73cce598c7 This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'.
[SVN r33417]
2006-03-21 02:26:31 +00:00
7 changed files with 35 additions and 39 deletions

21
CMakeLists.txt Normal file
View File

@ -0,0 +1,21 @@
#----------------------------------------------------------------------------
# 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

@ -2,7 +2,7 @@
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd"> "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<library name="Tribool" dirname="logic" id="tribool" <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> <libraryinfo>
<author> <author>
<firstname>Douglas</firstname> <firstname>Douglas</firstname>
@ -197,7 +197,7 @@ cout &lt;&lt; boolalpha &lt;&lt; x &lt;&lt; endl; // Prints "maybe"</programlist
</section> </section>
<xi:include href="reference.boostbook"/> <xi:include href="reference.xml"/>
<testsuite id="tribool.tests"> <testsuite id="tribool.tests">
<run-test filename="tribool_test.cpp"> <run-test filename="tribool_test.cpp">

View File

@ -336,7 +336,7 @@ inline tribool operator==(tribool x, tribool y)
if (indeterminate(x) || indeterminate(y)) if (indeterminate(x) || indeterminate(y))
return indeterminate; return indeterminate;
else 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)) if (indeterminate(x) || indeterminate(y))
return indeterminate; return indeterminate;
else 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)

6
test/CMakeLists.txt Normal file
View File

@ -0,0 +1,6 @@
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

@ -1,35 +0,0 @@
# Tribool library
# Copyright (C) 2002-2003 Douglas Gregor
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
# For more information, see http://www.boost.org/
# Testing Jamfile autogenerated from XML source
subproject libs/logic/test ;
# bring in rules for testing
SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
include testing.jam ;
# Make tests run by default.
DEPENDS all : test ;
{
# look in BOOST_ROOT for sources first, just in this Jamfile
local SEARCH_SOURCE = $(BOOST_ROOT) $(SEARCH_SOURCE) ;
test-suite logic
:
[ run libs/logic/test/tribool_test.cpp : : : : ]
[ run libs/logic/test/tribool_rename_test.cpp : : : : ]
[ run libs/logic/test/tribool_io_test.cpp : : : : ]
;
}

View File

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