Changeset 36:d05bbdf5eca5 in rrlib_util


Ignore:
Timestamp:
14.09.2011 17:07:27 (8 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Phase:
public
Rebase:
31626139303938393038313537396539383966383635663532323265303734383266643430663737
Message:

Moved join implementation to base as it does not only work for st containers

Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • join.h

    r34 r36  
    3232 */ 
    3333//---------------------------------------------------------------------- 
    34 #ifndef __rrlib__util__stl_container__join_h__ 
    35 #define __rrlib__util__stl_container__join_h__ 
     34#ifndef __rrlib__util__join_h__ 
     35#define __rrlib__util__join_h__ 
    3636 
    3737//---------------------------------------------------------------------- 
     
    8383} 
    8484 
    85 #include "rrlib/util/stl_container/join.hpp" 
     85#include "rrlib/util/join.hpp" 
    8686 
    8787#endif 
  • make.xml

    r28 r36  
    55  <rrlib name="util"> 
    66    <sources> 
     7      join.h 
    78      sFileIOUtils.cpp 
    89      sStringUtils.cpp 
     
    2021    <sources> 
    2122      tUnitTestSuite.cpp 
    22     </sources> 
    23   </rrlib> 
    24  
    25   <rrlib name="util_stl_container"> 
    26     <sources> 
    27       stl_container/* 
    2823    </sources> 
    2924  </rrlib> 
  • sFileIOUtils.cpp

    r34 r36  
    4848 
    4949#include "rrlib/util/sStringUtils.h" 
    50 #include "rrlib/util/stl_container/join.h" 
     50#include "rrlib/util/join.h" 
    5151#include "rrlib/logging/definitions.h" 
    5252 
Note: See TracChangeset for help on using the changeset viewer.