Subject: [Boost-commit] svn:boost r85618 - in branches/release: . boost boost/detail boost/predef boost/predef/detail libs libs/predef libs/predef/doc libs/predef/doc/html libs/predef/test status
From: grafikrobot_at_[hidden]
Date: 2013-09-09 00:06:52
Author: grafik
Date: 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013)
New Revision: 85618
URL: http://svn.boost.org/trac/boost/changeset/85618
Log:
Merge Predef library to release.
Added:
branches/release/boost/predef/ (props changed)
- copied from r85179, trunk/boost/predef/
branches/release/boost/predef.h (props changed)
- copied unchanged from r85164, trunk/boost/predef.h
branches/release/libs/predef/ (props changed)
- copied from r85164, trunk/libs/predef/
branches/release/libs/predef/doc/
- copied from r85179, trunk/libs/predef/doc/
branches/release/libs/predef/test/
- copied from r85179, trunk/libs/predef/test/
Deleted:
branches/release/libs/predef/doc/html/docutils.css
branches/release/libs/predef/doc/html/minimal.css
branches/release/libs/predef/doc/html/reference.css
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/endian.hpp (contents, props changed)
branches/release/libs/ (props changed)
branches/release/libs/libraries.htm (contents, props changed)
branches/release/libs/maintainers.txt (contents, props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (contents, props changed)
Text files modified:
branches/release/boost/detail/endian.hpp | 121 -----------------
branches/release/boost/predef.h | 19 ++
branches/release/boost/predef/detail/endian_compat.h | 2
branches/release/boost/predef/version_number.h | 2
branches/release/libs/libraries.htm | 14 ++
branches/release/libs/maintainers.txt | 1
/dev/null | 275 ----------------------------------------
/dev/null | 23 ---
/dev/null | 11 -
branches/release/libs/predef/test/info_as_c.c | 92 ++++++------
branches/release/libs/predef/test/info_as_cpp.cpp | 136 +++++++++---------
branches/release/libs/predef/test/make.cpp | 118 ++++++++--------
branches/release/libs/predef/test/version.cpp | 70 +++++-----
branches/release/status/Jamfile.v2 | 1
14 files changed, 248 insertions(+), 637 deletions(-)
Modified: branches/release/boost/detail/endian.hpp
==============================================================================
--- branches/release/boost/detail/endian.hpp Sun Sep 8 20:02:53 2013 (r85617)
+++ branches/release/boost/detail/endian.hpp 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618)
@@ -1,126 +1,11 @@
-// Copyright 2005 Caleb Epstein
-// Copyright 2006 John Maddock
-// Copyright 2010 Rene Rivera
+// Copyright 2013 Redshift Software Inc
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation. Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- */
-
-/*
- * Copyright notice reproduced from <boost/detail/limits.hpp>, from
- * which this code was originally taken.
- *
- * Modified by Caleb Epstein to use <endian.h> with GNU libc and to
- * defined the BOOST_ENDIAN macro.
- */
-
#ifndef BOOST_DETAIL_ENDIAN_HPP
#define BOOST_DETAIL_ENDIAN_HPP
-//
-// Special cases come first:
-//
-#if defined (__GLIBC__)
-// GNU libc offers the helpful header <endian.h> which defines
-// __BYTE_ORDER
-# include <endian.h>
-# if (__BYTE_ORDER == __LITTLE_ENDIAN)
-# define BOOST_LITTLE_ENDIAN
-# elif (__BYTE_ORDER == __BIG_ENDIAN)
-# define BOOST_BIG_ENDIAN
-# elif (__BYTE_ORDER == __PDP_ENDIAN)
-# define BOOST_PDP_ENDIAN
-# else
-# error Unknown machine endianness detected.
-# endif
-# define BOOST_BYTE_ORDER __BYTE_ORDER
-
-#elif defined(__NetBSD__) || defined(__FreeBSD__) || \
- defined(__OpenBSD__) || (__DragonFly__)
-//
-// BSD has endian.h, see https://svn.boost.org/trac/boost/ticket/6013
-# if defined(__OpenBSD__)
-# include <machine/endian.h>
-# else
-# include <sys/endian.h>
-# endif
-# if (_BYTE_ORDER == _LITTLE_ENDIAN)
-# define BOOST_LITTLE_ENDIAN
-# elif (_BYTE_ORDER == _BIG_ENDIAN)
-# define BOOST_BIG_ENDIAN
-# elif (_BYTE_ORDER == _PDP_ENDIAN)
-# define BOOST_PDP_ENDIAN
-# else
-# error Unknown machine endianness detected.
-# endif
-# define BOOST_BYTE_ORDER _BYTE_ORDER
-
-#elif defined( __ANDROID__ )
-// Adroid specific code, see: https://svn.boost.org/trac/boost/ticket/7528
-// Here we can use machine/_types.h, see:
-// http://stackoverflow.com/questions/6212951/endianness-of-android-ndk
-# include "machine/_types.h"
-# ifdef __ARMEB__
-# define BOOST_BIG_ENDIAN
-# define BOOST_BYTE_ORDER 4321
-# else
-# define BOOST_LITTLE_ENDIAN
-# define BOOST_BYTE_ORDER 1234
-# endif // __ARMEB__
-
-#elif defined( _XBOX )
-//
-// XBox is always big endian??
-//
-# define BOOST_BIG_ENDIAN
-# define BOOST_BYTE_ORDER 4321
+// Use the Predef library for the detection of endianess.
+#include <boost/predef/detail/endian_compat.h>
-#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) || \
- defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) || \
- defined(__BIGENDIAN__) && !defined(__LITTLEENDIAN__) || \
- defined(_STLP_BIG_ENDIAN) && !defined(_STLP_LITTLE_ENDIAN)
-# define BOOST_BIG_ENDIAN
-# define BOOST_BYTE_ORDER 4321
-#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) || \
- defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) || \
- defined(__LITTLEENDIAN__) && !defined(__BIGENDIAN__) || \
- defined(_STLP_LITTLE_ENDIAN) && !defined(_STLP_BIG_ENDIAN)
-# define BOOST_LITTLE_ENDIAN
-# define BOOST_BYTE_ORDER 1234
-#elif defined(__sparc) || defined(__sparc__) \
- || defined(_POWER) || defined(__powerpc__) \
- || defined(__ppc__) || defined(__hpux) || defined(__hppa) \
- || defined(_MIPSEB) || defined(_POWER) \
- || defined(__s390__) || defined(__ARMEB__)
-# define BOOST_BIG_ENDIAN
-# define BOOST_BYTE_ORDER 4321
-#elif defined(__i386__) || defined(__alpha__) \
- || defined(__ia64) || defined(__ia64__) \
- || defined(_M_IX86) || defined(_M_IA64) \
- || defined(_M_ALPHA) || defined(__amd64) \
- || defined(__amd64__) || defined(_M_AMD64) \
- || defined(__x86_64) || defined(__x86_64__) \
- || defined(_M_X64) || defined(__bfin__) \
- || defined(__ARMEL__) \
- || (defined(_WIN32) && defined(__ARM__) && defined(_MSC_VER)) // ARM Windows CE don't define anything reasonably unique, but there are no big-endian Windows versions
-
-# define BOOST_LITTLE_ENDIAN
-# define BOOST_BYTE_ORDER 1234
-#else
-# error The file boost/detail/endian.hpp needs to be set up for your CPU type.
#endif
-
-
-#endif
-
Copied: branches/release/boost/predef.h (from r85164, trunk/boost/predef.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/boost/predef.h 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618, copy of r85164, trunk/boost/predef.h)
@@ -0,0 +1,19 @@
+/*
+Copyright Redshift Software, Inc. 2008-2013
+Distributed under 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)
+*/
+
+#ifndef BOOST_PREDEF_H
+#define BOOST_PREDEF_H
+
+#include <boost/predef/language.h>
+#include <boost/predef/architecture.h>
+#include <boost/predef/compiler.h>
+#include <boost/predef/library.h>
+#include <boost/predef/os.h>
+#include <boost/predef/other.h>
+#include <boost/predef/platform.h>
+
+#endif
Modified: branches/release/boost/predef/detail/endian_compat.h
==============================================================================
--- trunk/boost/predef/detail/endian_compat.h Wed Jul 31 23:46:04 2013 (r85179)
+++ branches/release/boost/predef/detail/endian_compat.h 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618)
@@ -8,7 +8,7 @@
#ifndef BOOST_PREDEF_DETAIL_ENDIAN_COMPAT_H
#define BOOST_PREDEF_DETAIL_ENDIAN_COMPAT_H
-#include <boost/predef/endian.h>
+#include <boost/predef/other/endian.h>
#if BOOST_ENDIAN_BIG_BYTE
# define BOOST_BIG_ENDIAN
Modified: branches/release/boost/predef/version_number.h
==============================================================================
--- trunk/boost/predef/version_number.h Wed Jul 31 23:46:04 2013 (r85179)
+++ branches/release/boost/predef/version_number.h 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618)
@@ -49,6 +49,6 @@
BOOST_VERSION_NUMBER_MIN
#define BOOST_VERSION_NUMBER_NOT_AVAILABLE \
- BOOST_VERSION_NUMBER_ZERO
+ BOOST_VERSION_NUMBER_ZERO
#endif
Modified: branches/release/libs/libraries.htm
==============================================================================
--- branches/release/libs/libraries.htm Sun Sep 8 20:02:53 2013 (r85617)
+++ branches/release/libs/libraries.htm 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618)
@@ -242,6 +242,13 @@
<li>Phoenix - Define small unnamed
function objects at the actual call site, and more, from Joel de Guzman, Dan
Marsden and Thomas Heller</li>
+
+ <li>Predef - This library defines a set of
+ compiler, architecture, operating system, library, and other version
+ numbers from the information it can gather of C, C++, Objective C, and
+ Objective C++ predefined macros or those defined in generally available
+ headers, from Rene Rivera.</li>
+
<li>pointer container
- Containers for storing heap-allocated polymorphic objects to ease
OO-programming, from Thorsten Ottosen. </li>
@@ -868,6 +875,13 @@
Kevlin Henney.</li>
<li>numeric/conversion - Optimized Policy-based Numeric Conversions,
from Fernando Cacciola.</li>
+
+ <li>Predef - This library defines a set of
+ compiler, architecture, operating system, library, and other version
+ numbers from the information it can gather of C, C++, Objective C, and
+ Objective C++ predefined macros or those defined in generally available
+ headers, from Rene Rivera.</li>
+
<li>swap -
Enhanced generic swap function, from Joseph Gauterin.</li>
<li>timer - Event timer,
Modified: branches/release/libs/maintainers.txt
==============================================================================
--- branches/release/libs/maintainers.txt Sun Sep 8 20:02:53 2013 (r85617)
+++ branches/release/libs/maintainers.txt 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618)
@@ -79,6 +79,7 @@
phoenix Joel de Guzman <joel -at- boost-consulting.com>, Thomas Heller <thom.heller -at- gmail.com>
polygon Lucanus Simonson <lucanus.j.simonson -at- intel.com>, Andrii Sydorchuk <sydorchuk.andriy -at- gmail.com>
pool Stephen Cleary <scleary -at- jerviswebb.com>
+predef Rene Rivera <grafikrobot -at- gmail.com>
preprocessor Paul Mensonides <pmenso57 -at- comcast.net>
program_options Vladimir Prus <ghost -at- cs.msu.su>
property_map Douglas Gregor <dgregor -at- cs.indiana.edu>
Deleted: trunk/libs/predef/doc/html/docutils.css
==============================================================================
--- trunk/libs/predef/doc/html/docutils.css 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85179)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,275 +0,0 @@
-/*
-:Author: David Goodger
-:Contact: goodger_at_[hidden]
-:Date: $Date: 2007-04-16 23:44:59 -0500 (Mon, 16 Apr 2007) $
-:Revision: $Revision: 37457 $
-:Copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
-customize this style sheet.
-*/
-
-/* used to remove borders from tables and images */
-.borderless, table.borderless td, table.borderless th {
- border: 0 }
-
-table.borderless td, table.borderless th {
- /* Override padding for "table.docutils td" with "! important".
- The right padding separates the table cells. */
- padding: 0 0.5em 0 0 ! important }
-
-.first {
- /* Override more specific margin styles with "! important". */
- margin-top: 0 ! important }
-
-.last, .with-subtitle {
- margin-bottom: 0 ! important }
-
-.hidden {
- display: none }
-
-a.toc-backref {
- text-decoration: none ;
- color: black }
-
-blockquote.epigraph {
- margin: 2em 5em ; }
-
-dl.docutils dd {
- margin-bottom: 0.5em }
-
-/* Uncomment (and remove this text!) to get bold-faced definition list terms
-dl.docutils dt {
- font-weight: bold }
-*/
-
-div.abstract {
- margin: 2em 5em }
-
-div.abstract p.topic-title {
- font-weight: bold ;
- text-align: center }
-
-div.admonition, div.attention, div.caution, div.danger, div.error,
-div.hint, div.important, div.note, div.tip, div.warning {
- margin: 2em ;
- border: medium outset ;
- padding: 1em }
-
-div.admonition p.admonition-title, div.hint p.admonition-title,
-div.important p.admonition-title, div.note p.admonition-title,
-div.tip p.admonition-title {
- font-weight: bold ;
- font-family: sans-serif }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title {
- color: red ;
- font-weight: bold ;
- font-family: sans-serif }
-
-/* Uncomment (and remove this text!) to get reduced vertical space in
- compound paragraphs.
-div.compound .compound-first, div.compound .compound-middle {
- margin-bottom: 0.5em }
-
-div.compound .compound-last, div.compound .compound-middle {
- margin-top: 0.5em }
-*/
-
-div.dedication {
- margin: 2em 5em ;
- text-align: center ;
- font-style: italic }
-
-div.dedication p.topic-title {
- font-weight: bold ;
- font-style: normal }
-
-div.figure {
- margin-left: 2em ;
- margin-right: 2em }
-
-div.footer, div.header {
- clear: both;
- font-size: smaller }
-
-div.line-block {
- display: block ;
- margin-top: 1em ;
- margin-bottom: 1em }
-
-div.line-block div.line-block {
- margin-top: 0 ;
- margin-bottom: 0 ;
- margin-left: 1.5em }
-
-div.sidebar {
- margin-left: 1em ;
- border: medium outset ;
- padding: 1em ;
- background-color: #ffffee ;
- width: 40% ;
- float: right ;
- clear: right }
-
-div.sidebar p.rubric {
- font-family: sans-serif ;
- font-size: medium }
-
-div.system-messages {
- margin: 5em }
-
-div.system-messages h1 {
- color: red }
-
-div.system-message {
- border: medium outset ;
- padding: 1em }
-
-div.system-message p.system-message-title {
- color: red ;
- font-weight: bold }
-
-div.topic {
- margin: 2em }
-
-h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
-h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
- margin-top: 0.4em }
-
-h1.title {
- text-align: center }
-
-h2.subtitle {
- text-align: center }
-
-hr.docutils {
- width: 75% }
-
-img.align-left {
- clear: left }
-
-img.align-right {
- clear: right }
-
-ol.simple, ul.simple {
- margin-bottom: 1em }
-
-ol.arabic {
- list-style: decimal }
-
-ol.loweralpha {
- list-style: lower-alpha }
-
-ol.upperalpha {
- list-style: upper-alpha }
-
-ol.lowerroman {
- list-style: lower-roman }
-
-ol.upperroman {
- list-style: upper-roman }
-
-p.attribution {
- text-align: right ;
- margin-left: 50% }
-
-p.caption {
- font-style: italic }
-
-p.credits {
- font-style: italic ;
- font-size: smaller }
-
-p.label {
- white-space: nowrap }
-
-p.rubric {
- font-weight: bold ;
- font-size: larger ;
- color: maroon ;
- text-align: center }
-
-p.sidebar-title {
- font-family: sans-serif ;
- font-weight: bold ;
- font-size: larger }
-
-p.sidebar-subtitle {
- font-family: sans-serif ;
- font-weight: bold }
-
-p.topic-title {
- font-weight: bold }
-
-pre.address {
- margin-bottom: 0 ;
- margin-top: 0 ;
- font-family: serif ;
- font-size: 100% }
-
-pre.literal-block, pre.doctest-block {
- margin-left: 2em ;
- margin-right: 2em }
-
-span.classifier {
- font-family: sans-serif ;
- font-style: oblique }
-
-span.classifier-delimiter {
- font-family: sans-serif ;
- font-weight: bold }
-
-span.interpreted {
- font-family: sans-serif }
-
-span.option {
- white-space: nowrap }
-
-span.pre {
- white-space: pre }
-
-span.problematic {
- color: red }
-
-span.section-subtitle {
- /* font-size relative to parent (h1..h6 element) */
- font-size: 80% }
-
-table.citation {
- border-left: solid 1px gray;
- margin-left: 1px }
-
-table.docinfo {
- margin: 2em 4em }
-
-table.docutils {
- margin-top: 0.5em ;
- margin-bottom: 0.5em }
-
-table.footnote {
- border-left: solid 1px black;
- margin-left: 1px }
-
-table.docutils td, table.docutils th,
-table.docinfo td, table.docinfo th {
- padding-left: 0.5em ;
- padding-right: 0.5em ;
- vertical-align: top }
-
-table.docutils th.field-name, table.docinfo th.docinfo-name {
- font-weight: bold ;
- text-align: left ;
- white-space: nowrap ;
- padding-left: 0 }
-
-h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
-h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
- font-size: 100% }
-
-ul.auto-toc {
- list-style-type: none }
Deleted: trunk/libs/predef/doc/html/minimal.css
==============================================================================
--- trunk/libs/predef/doc/html/minimal.css 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85179)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,23 +0,0 @@
-/*
-
- © Copyright Beman Dawes, 2007
-
- Distributed under the Boost Software License, Version 1.0.
- See www.boost.org/LICENSE_1_0.txt
-
-*/
-
-body {
- font-family: sans-serif;
- margin: 1em;
- max-width : 8.5in;
- }
-
-table { margin: 0.5em; }
-
-pre { background-color:#D7EEFF }
-
-ins { background-color:#A0FFA0 }
-del { background-color:#FFA0A0 }
-
-/*** end ***/
\ No newline at end of file
Deleted: trunk/libs/predef/doc/html/reference.css
==============================================================================
--- trunk/libs/predef/doc/html/reference.css 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85179)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
-/*============================================================================
- Copyright 2003-2004 Douglas Gregor
- Distributed under the Boost Software License, Version 1.0. (See accompany-
- ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-============================================================================*/
-
-PRE.synopsis {
- background-color: #e0ffff;
- border: thin solid blue;
- padding: 1em
-}
\ No newline at end of file
Modified: branches/release/libs/predef/test/info_as_c.c
==============================================================================
--- trunk/libs/predef/test/info_as_c.c Wed Jul 31 23:46:04 2013 (r85179)
+++ branches/release/libs/predef/test/info_as_c.c 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618)
@@ -12,65 +12,65 @@
typedef struct predef_info
{
- unsigned tag;
- char * name;
- char * description;
- unsigned value;
+ unsigned tag;
+ char * name;
+ char * description;
+ unsigned value;
} predef_info;
predef_info first_predef_info = { 0x43210DEF , "-" , "-" , 0xFFFFFFFF };
#define BOOST_PREDEF_DECLARE_TEST(x,s) \
- predef_info x##_predef_info = { 0x67890DEF , #x , s , x };
+ predef_info x##_predef_info = { 0x67890DEF , #x , s , x };
#include <boost/predef.h>
predef_info last_predef_info = { 0xFFFFFFFF , "-" , "-" , 0x43210DEF };
int predef_info_compare(const void * a, const void * b)
{
- const predef_info ** i = (const predef_info **)a;
- const predef_info ** j = (const predef_info **)b;
- return strcmp((*i)->name,(*j)->name);
+ const predef_info ** i = (const predef_info **)a;
+ const predef_info ** j = (const predef_info **)b;
+ return strcmp((*i)->name,(*j)->name);
}
int main()
{
- unsigned x = 0;
- predef_info ** predefs = 0;
- unsigned predef_count = 0;
- unsigned * i = &first_predef_info.tag;
- unsigned * e = &last_predef_info.tag;
- while (i < e)
- {
- i += 1;
- if (*i == 0x67890DEF)
- {
- predef_count += 1;
- predefs = realloc(predefs,predef_count*sizeof(predef_info*));
- predefs[predef_count-1] = (predef_info*)i;
- }
- }
- qsort(predefs,predef_count,sizeof(predef_info*),predef_info_compare);
- puts("** Detected **");
- for (x = 0; x < predef_count; ++x)
- {
- if (predefs[x]->value > 0)
- printf("%s = %u (%u,%u,%u) | %s\n",
- predefs[x]->name,
- predefs[x]->value,
- (predefs[x]->value/10000000)%100,
- (predefs[x]->value/100000)%100,
- (predefs[x]->value)%100000,
- predefs[x]->description);
- }
- puts("** Not Detected **");
- for (x = 0; x < predef_count; ++x)
- {
- if (predefs[x]->value == 0)
- printf("%s = %u | %s\n",
- predefs[x]->name,
- predefs[x]->value,
- predefs[x]->description);
- }
- return 0;
+ unsigned x = 0;
+ predef_info ** predefs = 0;
+ unsigned predef_count = 0;
+ unsigned * i = &first_predef_info.tag;
+ unsigned * e = &last_predef_info.tag;
+ while (i < e)
+ {
+ i += 1;
+ if (*i == 0x67890DEF)
+ {
+ predef_count += 1;
+ predefs = realloc(predefs,predef_count*sizeof(predef_info*));
+ predefs[predef_count-1] = (predef_info*)i;
+ }
+ }
+ qsort(predefs,predef_count,sizeof(predef_info*),predef_info_compare);
+ puts("** Detected **");
+ for (x = 0; x < predef_count; ++x)
+ {
+ if (predefs[x]->value > 0)
+ printf("%s = %u (%u,%u,%u) | %s\n",
+ predefs[x]->name,
+ predefs[x]->value,
+ (predefs[x]->value/10000000)%100,
+ (predefs[x]->value/100000)%100,
+ (predefs[x]->value)%100000,
+ predefs[x]->description);
+ }
+ puts("** Not Detected **");
+ for (x = 0; x < predef_count; ++x)
+ {
+ if (predefs[x]->value == 0)
+ printf("%s = %u | %s\n",
+ predefs[x]->name,
+ predefs[x]->value,
+ predefs[x]->description);
+ }
+ return 0;
}
Modified: branches/release/libs/predef/test/info_as_cpp.cpp
==============================================================================
--- trunk/libs/predef/test/info_as_cpp.cpp Wed Jul 31 23:46:04 2013 (r85179)
+++ branches/release/libs/predef/test/info_as_cpp.cpp 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618)
@@ -12,79 +12,79 @@
namespace
{
- struct predef_info
- {
- std::string name;
- std::string description;
- unsigned value;
-
- predef_info(
- std::string const & n,
- std::string const & d,
- unsigned v);
-
- predef_info(
- predef_info const & other)
- : name(other.name)
- , description(other.description)
- , value(other.value)
- {
- }
-
- bool operator < (predef_info const & other) const
- {
- return name < other.name;
- }
- };
-
- std::set<predef_info> * predefs = 0;
-
- predef_info::predef_info(
- std::string const & n,
- std::string const & d,
- unsigned v)
- : name(n)
- , description(d)
- , value(v)
- {
- if (!predefs)
- {
- predefs = new std::set<predef_info>();
- }
- predefs->insert(*this);
- }
+ struct predef_info
+ {
+ std::string name;
+ std::string description;
+ unsigned value;
+
+ predef_info(
+ std::string const & n,
+ std::string const & d,
+ unsigned v);
+
+ predef_info(
+ predef_info const & other)
+ : name(other.name)
+ , description(other.description)
+ , value(other.value)
+ {
+ }
+
+ bool operator < (predef_info const & other) const
+ {
+ return name < other.name;
+ }
+ };
+
+ std::set<predef_info> * predefs = 0;
+
+ predef_info::predef_info(
+ std::string const & n,
+ std::string const & d,
+ unsigned v)
+ : name(n)
+ , description(d)
+ , value(v)
+ {
+ if (!predefs)
+ {
+ predefs = new std::set<predef_info>();
+ }
+ predefs->insert(*this);
+ }
}
#define BOOST_PREDEF_DECLARE_TEST(x,s) \
- namespace { \
- predef_info x##_predef_init(#x,s,x); \
- }
+ namespace { \
+ predef_info x##_predef_init(#x,s,x); \
+ }
#include <boost/predef.h>
int main()
{
- std::set<predef_info>::iterator i;
- std::set<predef_info>::iterator e = predefs->end();
- std::cout << "** Detected **" << std::endl;
- for (i = predefs->begin(); i != e; ++i)
- {
- if (i->value > 0)
- std::cout
- << i->name << " = "
- << i->value
- << " (" << (i->value/10000000)%100 << "," << (i->value/100000)%100 << "," << (i->value)%100000 << ") | "
- << i->description
- << std::endl;
- }
- std::cout << "** Not Detected **" << std::endl;
- for (i = predefs->begin(); i != e; ++i)
- {
- if (i->value == 0)
- std::cout
- << i->name << " = "
- << i->value << " | "
- << i->description
- << std::endl;
- }
- return 0;
+ std::set<predef_info>::iterator i;
+ std::set<predef_info>::iterator e = predefs->end();
+ std::cout << "** Detected **" << std::endl;
+ for (i = predefs->begin(); i != e; ++i)
+ {
+ if (i->value > 0)
+ std::cout
+ << i->name << " = "
+ << i->value
+ << " (" << (i->value/10000000)%100 << "," << (i->value/100000)%100 << "," << (i->value)%100000 << ") | "
+ << i->description
+ << std::endl;
+ }
+ std::cout << "** Not Detected **" << std::endl;
+ for (i = predefs->begin(); i != e; ++i)
+ {
+ if (i->value == 0)
+ std::cout
+ << i->name << " = "
+ << i->value << " | "
+ << i->description
+ << std::endl;
+ }
+ return 0;
}
Modified: branches/release/libs/predef/test/make.cpp
==============================================================================
--- trunk/libs/predef/test/make.cpp Wed Jul 31 23:46:04 2013 (r85179)
+++ branches/release/libs/predef/test/make.cpp 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618)
@@ -13,75 +13,75 @@
namespace
{
- struct test_info
- {
- std::string value;
- bool passed;
-
- test_info(std::string const & v, bool p) : value(v), passed(p) {}
- test_info(test_info const & o) : value(o.value), passed(o.passed) {}
- };
+ struct test_info
+ {
+ std::string value;
+ bool passed;
+
+ test_info(std::string const & v, bool p) : value(v), passed(p) {}
+ test_info(test_info const & o) : value(o.value), passed(o.passed) {}
+ };
- std::vector<test_info> test_results;
+ std::vector<test_info> test_results;
}
#define PREDEF_CHECK(X) test_results.push_back(test_info(#X,(X)))
void test_BOOST_VERSION_NUMBER()
{
- PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRP(0xFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xF));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRP(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xF,0xF));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRPP(0xFFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xFF));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRR(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0x0));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPPPP(0xFFFFFFF) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFFFF));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRRP(0xFFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0xF));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPP000(0xFFFFF000) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFF));
-
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP(999) == BOOST_VERSION_NUMBER(9,9,9));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VPPP(9999) == BOOST_VERSION_NUMBER(9,0,999));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRRPP(999999) == BOOST_VERSION_NUMBER(99,99,99));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR(9999) == BOOST_VERSION_NUMBER(99,99,0));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRPP(9999) == BOOST_VERSION_NUMBER(9,9,99));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRRPP(99999) == BOOST_VERSION_NUMBER(9,99,99));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP000(999000) == BOOST_VERSION_NUMBER(9,9,9));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR000(999000) == BOOST_VERSION_NUMBER(9,99,0));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900) == BOOST_VERSION_NUMBER(21,99,99));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(9999009900L) == BOOST_VERSION_NUMBER(99,99,99));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PP00(999909900) == BOOST_VERSION_NUMBER(99,99,99));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VV00(9900) == BOOST_VERSION_NUMBER(99,00,00));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PPPP(999909999) == BOOST_VERSION_NUMBER(99,99,9999));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR(999) == BOOST_VERSION_NUMBER(9,99,00));
-
- PREDEF_CHECK(BOOST_PREDEF_MAKE_DATE(1971,1,1) == BOOST_VERSION_NUMBER(1,1,1));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19700101) == BOOST_VERSION_NUMBER(0,1,1));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19710101) == BOOST_VERSION_NUMBER(1,1,1));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(20691231) == BOOST_VERSION_NUMBER(99,12,31));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(197001) == BOOST_VERSION_NUMBER(0,1,1));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(197101) == BOOST_VERSION_NUMBER(1,1,1));
- PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(206912) == BOOST_VERSION_NUMBER(99,12,1));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRP(0xFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xF));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRP(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xF,0xF));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRPP(0xFFFF) == BOOST_VERSION_NUMBER(0xF,0xF,0xFF));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRR(0xFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0x0));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPPPP(0xFFFFFFF) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFFFF));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VVRRP(0xFFFFF) == BOOST_VERSION_NUMBER(0xFF,0xFF,0xF));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_0X_VRRPP000(0xFFFFF000) == BOOST_VERSION_NUMBER(0xF,0xFF,0xFF));
+
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP(999) == BOOST_VERSION_NUMBER(9,9,9));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VPPP(9999) == BOOST_VERSION_NUMBER(9,0,999));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRRPP(999999) == BOOST_VERSION_NUMBER(99,99,99));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR(9999) == BOOST_VERSION_NUMBER(99,99,0));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRPP(9999) == BOOST_VERSION_NUMBER(9,9,99));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRRPP(99999) == BOOST_VERSION_NUMBER(9,99,99));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRP000(999000) == BOOST_VERSION_NUMBER(9,9,9));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR000(999000) == BOOST_VERSION_NUMBER(9,99,0));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(2199009900) == BOOST_VERSION_NUMBER(21,99,99));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR00PP00(9999009900L) == BOOST_VERSION_NUMBER(99,99,99));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PP00(999909900) == BOOST_VERSION_NUMBER(99,99,99));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VV00(9900) == BOOST_VERSION_NUMBER(99,00,00));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VVRR0PPPP(999909999) == BOOST_VERSION_NUMBER(99,99,9999));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_10_VRR(999) == BOOST_VERSION_NUMBER(9,99,00));
+
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_DATE(1971,1,1) == BOOST_VERSION_NUMBER(1,1,1));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19700101) == BOOST_VERSION_NUMBER(0,1,1));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(19710101) == BOOST_VERSION_NUMBER(1,1,1));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMMDD(20691231) == BOOST_VERSION_NUMBER(99,12,31));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(197001) == BOOST_VERSION_NUMBER(0,1,1));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(197101) == BOOST_VERSION_NUMBER(1,1,1));
+ PREDEF_CHECK(BOOST_PREDEF_MAKE_YYYYMM(206912) == BOOST_VERSION_NUMBER(99,12,1));
}
int main()
{
- test_BOOST_VERSION_NUMBER();
+ test_BOOST_VERSION_NUMBER();
- unsigned fail_count = 0;
- std::vector<test_info>::iterator i = test_results.begin();
- std::vector<test_info>::iterator e = test_results.end();
- for (; i != e; ++i)
- {
- std::cout
- << (i->passed ? "[passed]" : "[failed]")
- << " " << i->value
- << std::endl;
- fail_count += i->passed ? 0 : 1;
- }
- std::cout
- << std::endl
- << "TOTAL: "
- << "passed " << (test_results.size()-fail_count) << ", "
- << "failed " << (fail_count) << ", "
- << "of " << (test_results.size())
- << std::endl;
- return fail_count;
+ unsigned fail_count = 0;
+ std::vector<test_info>::iterator i = test_results.begin();
+ std::vector<test_info>::iterator e = test_results.end();
+ for (; i != e; ++i)
+ {
+ std::cout
+ << (i->passed ? "[passed]" : "[failed]")
+ << " " << i->value
+ << std::endl;
+ fail_count += i->passed ? 0 : 1;
+ }
+ std::cout
+ << std::endl
+ << "TOTAL: "
+ << "passed " << (test_results.size()-fail_count) << ", "
+ << "failed " << (fail_count) << ", "
+ << "of " << (test_results.size())
+ << std::endl;
+ return fail_count;
}
Modified: branches/release/libs/predef/test/version.cpp
==============================================================================
--- trunk/libs/predef/test/version.cpp Wed Jul 31 23:46:04 2013 (r85179)
+++ branches/release/libs/predef/test/version.cpp 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618)
@@ -12,51 +12,51 @@
namespace
{
- struct test_info
- {
- std::string value;
- bool passed;
-
- test_info(std::string const & v, bool p) : value(v), passed(p) {}
- test_info(test_info const & o) : value(o.value), passed(o.passed) {}
- };
+ struct test_info
+ {
+ std::string value;
+ bool passed;
+
+ test_info(std::string const & v, bool p) : value(v), passed(p) {}
+ test_info(test_info const & o) : value(o.value), passed(o.passed) {}
+ };
- std::vector<test_info> test_results;
+ std::vector<test_info> test_results;
}
#define PREDEF_CHECK(X) test_results.push_back(test_info(#X,(X)))
void test_BOOST_VERSION_NUMBER()
{
- PREDEF_CHECK(BOOST_VERSION_NUMBER(0,0,1) == 1L);
- PREDEF_CHECK(BOOST_VERSION_NUMBER(99,99,99999) == 999999999L);
- PREDEF_CHECK(BOOST_VERSION_NUMBER(299,99,99999) != 2999999999L);
- PREDEF_CHECK(BOOST_VERSION_NUMBER(100,99,99999) != 1009999999L);
- PREDEF_CHECK(BOOST_VERSION_NUMBER(100,99,99999) == 9999999L);
- PREDEF_CHECK(BOOST_VERSION_NUMBER(100,100,100000) == 0L);
+ PREDEF_CHECK(BOOST_VERSION_NUMBER(0,0,1) == 1L);
+ PREDEF_CHECK(BOOST_VERSION_NUMBER(99,99,99999) == 999999999L);
+ PREDEF_CHECK(BOOST_VERSION_NUMBER(299,99,99999) != 2999999999L);
+ PREDEF_CHECK(BOOST_VERSION_NUMBER(100,99,99999) != 1009999999L);
+ PREDEF_CHECK(BOOST_VERSION_NUMBER(100,99,99999) == 9999999L);
+ PREDEF_CHECK(BOOST_VERSION_NUMBER(100,100,100000) == 0L);
}
int main()
{
- test_BOOST_VERSION_NUMBER();
+ test_BOOST_VERSION_NUMBER();
- unsigned fail_count = 0;
- std::vector<test_info>::iterator i = test_results.begin();
- std::vector<test_info>::iterator e = test_results.end();
- for (; i != e; ++i)
- {
- std::cout
- << (i->passed ? "[passed]" : "[failed]")
- << " " << i->value
- << std::endl;
- fail_count += i->passed ? 0 : 1;
- }
- std::cout
- << std::endl
- << "TOTAL: "
- << "passed " << (test_results.size()-fail_count) << ", "
- << "failed " << (fail_count) << ", "
- << "of " << (test_results.size())
- << std::endl;
- return fail_count;
+ unsigned fail_count = 0;
+ std::vector<test_info>::iterator i = test_results.begin();
+ std::vector<test_info>::iterator e = test_results.end();
+ for (; i != e; ++i)
+ {
+ std::cout
+ << (i->passed ? "[passed]" : "[failed]")
+ << " " << i->value
+ << std::endl;
+ fail_count += i->passed ? 0 : 1;
+ }
+ std::cout
+ << std::endl
+ << "TOTAL: "
+ << "passed " << (test_results.size()-fail_count) << ", "
+ << "failed " << (fail_count) << ", "
+ << "of " << (test_results.size())
+ << std::endl;
+ return fail_count;
}
Modified: branches/release/status/Jamfile.v2
==============================================================================
--- branches/release/status/Jamfile.v2 Sun Sep 8 20:02:53 2013 (r85617)
+++ branches/release/status/Jamfile.v2 2013-09-09 00:06:52 EDT (Mon, 09 Sep 2013) (r85618)
@@ -122,6 +122,7 @@
phoenix/test # test-suite phoenix
polygon/test # test-suite polygon
pool/test # test-suite pool
+ predef/test # test-suite predef
preprocessor/test # test-suite preprocessor
program_options/test # test-suite program_options
property_map/test # test-suite property_map