Changeset 207


Ignore:
Timestamp:
05/27/09 16:42:08 (3 years ago)
Author:
rkuck
Message:

Corrected tr1 header include lines

This mostly involved blaming the right tool and making the include lines
consistent. Also added text to the documentation how missing tr1 support can
be worked around.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/avango-core/include/avango/Distributed.h

    r166 r207  
    3232 */ 
    3333 
    34 #if !defined(_WIN32) 
     34#ifdef __GNUC__ // GNU C++ stores TR1 headers differently 
    3535#include <tr1/unordered_set> 
     36#else 
     37#include <unordered_set> 
    3638#endif 
    3739 
    … …  
    148150  }; 
    149151 
    150 #if !defined(_WIN32) 
    151152  typedef std::tr1::unordered_set<Link<Distributed>, AnyLink::Hasher, std::equal_to<AnyLink> > DistributedSet; 
    152 #endif 
    153153} 
    154154 

  • trunk/avango-core/include/avango/FieldContainer.h

    r119 r207  
    3636#include <avango/StandardFields.h> 
    3737 
    38 #ifdef _MSC_VER //MS stores headers differently 
     38#ifdef __GNUC__ // GNU C++ stores TR1 headers differently 
     39#include <tr1/unordered_map> 
     40#else 
    3941#include <unordered_map> 
    40 #else 
    41 #include <tr1/unordered_map> 
    4242#endif 
    4343 

  • trunk/avango-core/include/avango/MaestroEID.h

    r1 r207  
    3030#include <set> 
    3131#include <string> 
     32#include <vector> 
     33 
     34#ifdef __GNUC__ // GNU C++ stores TR1 headers differently 
    3235#include <tr1/functional> 
    3336#include <tr1/unordered_map> 
    3437#include <tr1/unordered_set> 
    35 #include <vector> 
     38#else 
     39#include <functional> 
     40#include <unordered_map> 
     41#include <unordered_set> 
     42#endif 
    3643 
    3744#include <avango/ensemble/maestro/Maestro_Types.h> 

  • trunk/avango-core/include/avango/NetID.h

    r18 r207  
    2929#include <string> 
    3030#include <iosfwd> 
     31 
     32#ifdef __GNUC__ // GNU C++ stores TR1 headers differently 
    3133#include <tr1/unordered_set> 
     34#else 
     35#include <unordered_map> 
     36#endif 
    3237 
    3338 

  • trunk/avango-core/include/avango/NetMap.h

    r1 r207  
    2828 
    2929#include <iosfwd> 
     30#include <vector> 
     31 
     32#ifdef __GNUC__ // GNU C++ stores TR1 headers differently 
    3033#include <tr1/unordered_map> 
    31 #include <vector> 
     34#else 
     35#include <unordered_map> 
     36#endif 
    3237 
    3338// #include <avango/MaestroEID.h> 

  • trunk/avango-core/include/avango/NetNode.h

    r1 r207  
    3131#include <map> 
    3232#include <string> 
     33#include <vector> 
     34 
     35#ifdef __GNUC__ // GNU C++ stores TR1 headers differently 
    3336#include <tr1/unordered_map> 
    34 #include <vector> 
     37#else 
     38#include <unordered_map> 
     39#endif 
    3540 
    3641#include <avango/ensemble/maestro/Maestro.h> 

  • trunk/avango-doc/guide/installing.html

    r206 r207  
    3838    <li>Development tools: 
    3939        <ul> 
    40             <li>Suitable C++ compiler: building AVANGO has been tested with the <a href="http://gcc.gnu.org/">GNU C++ compiler</a>, the <a href="http://software.intel.com/en-us/intel-compilers/">Intel C++ compiler</a> and the <a href="http://msdn.microsoft.com/en-us/visualc/default.aspx">Microsoft C++ compiler</a>. Note that the C++ TR1 feature set is required.</li> 
     40            <li>Suitable C++ compiler: building AVANGO has been tested with the <a href="http://gcc.gnu.org/">GNU C++ compiler</a>, the <a href="http://software.intel.com/en-us/intel-compilers/">Intel C++ compiler</a> and the <a href="http://msdn.microsoft.com/en-us/visualc/default.aspx">Microsoft C++ compiler</a>. Note that the C++ TR1 feature set is required, which most modern C++ compilers provide. Otherwise the TR1 implementation from the Boost library can be used (1.36 is required in this case; see below for the required setup).</li> 
     41 
    4142            <li><a href="http://www.python.org/download/">Python programming language</a>2.4 or later (however, no work has been done to make AVANGO compatible with the upcoming 3.0 release).</li> 
    4243            <li><a href="http://www.scons.org/download.php">scons build system</a> 0.96.93 or later (1.0.0 is supported)</li> 
    … …  
    8485<p>Note that the AVANGO build system does not differentiate between different search paths 
    8586for different libraries.</p> 
     87 
     88<p>If the Boost TR1 library has to be used (e.g. when no implementation is provided by the compiler), the header search path has to be setup properly. <a href="http://www.boost.org/doc/html/boost_tr1/usage.html">This documentation</a> gives more information. As a simple example, assume that Boost is installed under <code>/opt/boost-1.36</code>. The following line should then be appended to your <code>localdefs.py</code>:</p> 
     89 
     90<div class="code"><pre> 
     91INCLUDE_PATH = '/opt/boost-1.36/boost/tr1/tr1' 
     92</pre></div> 
    8693 
    8794<h4>Compiling AVANGO</h4> 

  • trunk/avango-osg/include/avango/osg/network/NetMatrixTransform.h

    r1 r207  
    3636#include <avango/Application.h> 
    3737 
     38#ifdef __GNUC__ // GNU C++ stores TR1 headers differently 
    3839#include <tr1/unordered_map> 
     40#else 
     41#include <unordered_map> 
     42#endif 
    3943 
    4044namespace av 
Note: See TracChangeset for help on using the changeset viewer.