Switch to unified view

a/upmpd/conftree.hxx b/upmpd/conftree.hxx
...
...
47
 * The ConfStack class stacks several Con(Simple/Tree) objects so that
47
 * The ConfStack class stacks several Con(Simple/Tree) objects so that
48
 * parameters from the top of the stack override the values from lower
48
 * parameters from the top of the stack override the values from lower
49
 * (useful to have central/personal config files)
49
 * (useful to have central/personal config files)
50
 */
50
 */
51
51
52
#include <string>
52
#include <time.h>                       // for time_t
53
#include <map>
53
#include <algorithm>                    // for sort, unique
54
#include <vector>
54
#include <map>                          // for map, etc
55
#include <algorithm>
55
#include <string>                       // for string, operator==, etc
56
#include <vector>                       // for vector, etc
56
57
57
// rh7.3 likes iostream better...
58
// rh7.3 likes iostream better...
58
#if defined(__GNUC__) && __GNUC__ < 3
59
#if defined(__GNUC__) && __GNUC__ < 3
59
#include <iostream>
60
#include <iostream>
60
#else
61
#else
61
#include <istream>
62
#include <istream>                      // for istream, ostream
62
#include <ostream>
63
#endif
63
#endif
64
65
#include "upmpdutils.hxx"               // for path_cat
64
66
65
using std::string;
67
using std::string;
66
using std::vector;
68
using std::vector;
67
using std::map;
69
using std::map;
68
using std::istream;
70
using std::istream;
69
using std::ostream;
71
using std::ostream;
70
71
#include "upmpdutils.hxx"
72
72
73
/** Internal class used for storing presentation information */
73
/** Internal class used for storing presentation information */
74
class ConfLine {
74
class ConfLine {
75
public:
75
public:
76
    enum Kind {CFL_COMMENT, CFL_SK, CFL_VAR};
76
    enum Kind {CFL_COMMENT, CFL_SK, CFL_VAR};