Changeset 548cbf


Ignore:
Timestamp:
Nov 10, 2009, 8:53:33 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
f28e0c
Parents:
e960b1
Message:

BUGFIX: Output is again indented, errorLogger prefixes according to verbosity.

  • BUGFIX: as "(logger << verbose) = cout" was evaluated, this did not translate to (cout << verbose). Hence, the tabbing was lost. This is fixed.
  • errorLogger::operator << : 0 - CRITICL, 1 - ERROR, 2, ... - WARNING
  • in class Verbose the logger::operator functions are declared friend to allow access to Verbose::verbosity
Location:
molecuilder/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/errorlogger.cpp

    re960b1 r548cbf  
    8181  int verbosityLevel = l.verbosity;
    8282  l.nix->clear();
    83   if (v.DoOutput(verbosityLevel))
     83  if (v.DoOutput(verbosityLevel)) {
     84    v.print(cout);
     85    switch(v.Verbosity) {
     86      case 0:
     87        cout << "CRITICAL: ";
     88        break;
     89      case 1:
     90        cout << "ERROR: ";
     91        break;
     92      case 2:
     93        cout << "WARNING: ";
     94        break;
     95      default:
     96        break;
     97    }
    8498    return cerr;
    85   else
     99  } else
    86100    return *l.nix;
    87101};
    … …  
    90104  int verbosityLevel = l->verbosity;
    91105  l->nix->clear();
    92   if (v.DoOutput(verbosityLevel))
     106  if (v.DoOutput(verbosityLevel)) {
     107    v.print(cout);
     108    switch(v.Verbosity) {
     109      case 0:
     110        cout << "CRITICAL: ";
     111        break;
     112      case 1:
     113        cout << "ERROR: ";
     114        break;
     115      case 2:
     116        cout << "WARNING: ";
     117        break;
     118      default:
     119        break;
     120    }
    93121    return cerr;
    94   else
     122  } else
    95123    return *l->nix;
    96124};

  • molecuilder/src/logger.cpp

    re960b1 r548cbf  
    8181  int verbosityLevel = l.verbosity;
    8282  l.nix->clear();
    83   if (v.DoOutput(verbosityLevel))
     83  if (v.DoOutput(verbosityLevel)) {
     84    v.print(cout);
    8485    return cout;
    85   else
     86  } else
    8687    return *l.nix;
    8788};
    … …  
    9091  int verbosityLevel = l->verbosity;
    9192  l->nix->clear();
    92   if (v.DoOutput(verbosityLevel))
     93  if (v.DoOutput(verbosityLevel)) {
     94    v.print(cout);
    9395    return cout;
    94   else
     96  } else
    9597    return *l->nix;
    9698};

  • molecuilder/src/verbose.hpp

    re960b1 r548cbf  
    2929    Verbose(int value) : Verbosity(value) { }
    3030
     31    // allow access to private variable Verbose::Verbosity
     32    friend ostream& operator<<(class errorLogger& l, const Verbose& v);
     33    friend ostream& operator<<(class errorLogger* l, const Verbose& v);
     34    friend ostream& operator<<(class logger& l, const Verbose& v);
     35    friend ostream& operator<<(class logger* l, const Verbose& v);
     36
    3137    ostream& print (ostream &ost) const;
    3238    bool DoOutput(int verbosityLevel) const;
Note: See TracChangeset for help on using the changeset viewer.