fix compilation problem with Boost 1.35
This commit is contained in:
parent
7c56c71d00
commit
012944a461
5 changed files with 12 additions and 48 deletions
|
|
@ -27,7 +27,9 @@
|
|||
#include "proc/nobugcfg.hpp"
|
||||
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/algorithm/string/split.hpp>
|
||||
#include <boost/algorithm/string/join.hpp>
|
||||
#include <boost/algorithm/string/classification.hpp>
|
||||
|
||||
using boost::algorithm::split;
|
||||
using boost::algorithm::join;
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
/*
|
||||
ToolFactory - supply of Tool implementations for the Builder
|
||||
|
||||
Copyright (C) Lumiera.org
|
||||
2008, Hermann Vosseler <Ichthyostega@web.de>
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
* *****************************************************/
|
||||
|
||||
|
||||
#include "proc/mobject/builder/toolfactory.hpp"
|
||||
|
||||
namespace mobject
|
||||
{
|
||||
namespace builder
|
||||
{
|
||||
|
||||
|
||||
|
||||
BuilderTool &
|
||||
ToolFactory::configure ()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
|
||||
} // namespace mobject::builder
|
||||
|
||||
} // namespace mobject
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
#include "common/factory.hpp"
|
||||
//#include "common/util.hpp"
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/algorithm/string/join.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/format.hpp>
|
||||
#include <iostream>
|
||||
|
|
|
|||
|
|
@ -747,7 +747,7 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
|
|||
}
|
||||
//}}}</pre>
|
||||
</div>
|
||||
<div title="BuildDependencies" modifier="Ichthyostega" modified="200804120311" created="200803261326" changecount="7">
|
||||
<div title="BuildDependencies" modifier="Ichthyostega" modified="200807090323" created="200803261326" changecount="9">
|
||||
<pre>! Programming Languages
|
||||
* C
|
||||
** a C99 compatible compiler, some GCC extensions are used, most are optional.
|
||||
|
|
@ -778,9 +778,10 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
|
|||
* bouml
|
||||
|
||||
! Libraries
|
||||
* boost (see above)
|
||||
* boost (see above, version 1.35 works too)
|
||||
* NoBug
|
||||
* gavl
|
||||
* [[GAVL|http://gmerlin.sourceforge.net/gavl.html]] (1.0.0)
|
||||
|
||||
</pre>
|
||||
</div>
|
||||
<div title="ColorPalette" modifier="CehTeh" modified="200803261254" created="200803261252" changecount="5">
|
||||
|
|
|
|||
|
|
@ -759,10 +759,11 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
|
|||
}
|
||||
//}}}</pre>
|
||||
</div>
|
||||
<div title="BuildDependenceis" modifier="Ichthyostega" modified="200708210341" created="200708120103" tags="organization buildsys" changecount="7">
|
||||
<div title="BuildDependenceis" modifier="Ichthyostega" modified="200807090324" created="200708120103" tags="organization buildsys" changecount="10">
|
||||
<pre>for __Building__
|
||||
* gcc (4.1), glibc6 (2.3), libstdc++6 (4.1)
|
||||
* [[build system|BuildSystem]] dependencies: SCons (0.96.90), Python (2.3)
|
||||
* [[GAVL|http://gmerlin.sourceforge.net/gavl.html]] (1.0.0)
|
||||
* NoBug for Logging, Tracing, Asserting (can be obtained from [[Pipapo.org|http://www.pipapo.org/pipawiki/NoBug]])
|
||||
* ~NoBug needs [[valgrind|Valgrind]] (3.2), execinfo.h and libpthread (&rarr; glibc)
|
||||
* std::tr1 &mdash; esp. for the former BOOST::shared_ptr (which is now proposed standard)
|
||||
|
|
@ -774,6 +775,8 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
|
|||
** libboost-regex1.34.1 (=1.34.1-2) ''binary..''
|
||||
//usually, newer versions are OK//
|
||||
|
||||
boost 1.35 works too.
|
||||
|
||||
for __Running__</pre>
|
||||
</div>
|
||||
<div title="BuildSystem" modifier="Ichthyostega" modified="200708120101" created="200708051532" tags="organization buildsys" changecount="4">
|
||||
|
|
|
|||
Loading…
Reference in a new issue