Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8779 for code/branches/output


Ignore:
Timestamp:
Jul 25, 2011, 6:28:57 PM (13 years ago)
Author:
landauf
Message:

small changes regarding context functions and orxout()

Location:
code/branches/output/src/libraries/util
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/output/src/libraries/util/Output.h

    r8777 r8779  
    3535namespace orxonox
    3636{
    37 using namespace test;
    3837namespace test
    3938{
     39    // Just for convenience
     40    using std::endl;
    4041    using namespace level;
    4142
    42     inline OutputStream& orxout(OutputLevel level = level::debug_output, OutputContextFunction context = context::undefined)
     43    inline OutputStream& orxout(OutputLevel level = level::debug_output, OutputContext context = context::undefined())
    4344    {
    4445        static OutputStream stream;
     
    4647        return stream;
    4748    }
     49
     50    inline OutputStream& orxout(OutputLevel level, OutputContextFunction context)
     51    {
     52        return orxout(level, context());
     53    }
    4854}
    4955}
  • code/branches/output/src/libraries/util/output/OutputStream.cc

    r8777 r8779  
    4848    }
    4949
    50     void OutputStream::setOutputAttributes(OutputLevel level, OutputContextFunction context)
     50    void OutputStream::setOutputAttributes(OutputLevel level, OutputContext context)
    5151    {
    5252        this->level_ = level;
    53         this->context_ = context();
     53        this->context_ = context;
    5454
    5555        this->bAcceptsOutput_ = OutputManager::getInstanceAndCreateListeners().acceptsOutput(this->level_, this->context_);
  • code/branches/output/src/libraries/util/output/OutputStream.h

    r8777 r8779  
    4747            _UtilExport OutputStream();
    4848
    49             void _UtilExport setOutputAttributes(OutputLevel level, OutputContextFunction context);
     49            void _UtilExport setOutputAttributes(OutputLevel level, OutputContext context);
    5050
    5151            template <class T>
Note: See TracChangeset for help on using the changeset viewer.