Commit d534a6f8 authored by Pavel Vainerman's avatar Pavel Vainerman

minor fixes..

parent bf87ff50
......@@ -138,7 +138,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
if( !stype.empty() && st == ComediInterface::Unknown )
{
ostringstream err;
err << "Unknown subdev type '" << stype << " for " << t1;
err << "Unknown subdev type '" << stype << " for " << t1.str();
throw SystemError(err.str());
}
......
......@@ -61,7 +61,7 @@ void Element::setChildOut()
it.el->setIn(it.num, _myout);
}
// -------------------------------------------------------------------------
std::shared_ptr<Element> Element::find( ElementID id )
std::shared_ptr<Element> Element::find( const ElementID id )
{
for( const auto& it : outs )
{
......
......@@ -13,7 +13,7 @@ class LogicException:
{
public:
LogicException(): UniSetTypes::Exception("LogicException") {}
LogicException(std::string err): UniSetTypes::Exception(err) {}
LogicException( const std::string err): UniSetTypes::Exception(err) {}
};
......@@ -54,7 +54,7 @@ class Element
return "?type?";
}
virtual std::shared_ptr<Element> find( ElementID id );
virtual std::shared_ptr<Element> find( const ElementID id );
virtual void addChildOut( std::shared_ptr<Element> el, int in_num );
virtual void delChildOut( std::shared_ptr<Element> el );
......
......@@ -88,7 +88,7 @@ DebugStream::~DebugStream()
//--------------------------------------------------------------------------
const DebugStream& DebugStream::operator=( const DebugStream& r )
{
if( r == *this )
if( &r == this )
return *this;
dt = r.dt;
......
......@@ -124,10 +124,10 @@ namespace ORepHelpers
{
ostringstream err;
err << "OREPHELPER(getContext): поймали omniORB::fatalException:";
uwarn << err << endl;
uwarn << " file: " << fe.file() << endl;
uwarn << " line: " << fe.line() << endl;
uwarn << " mesg: " << fe.errmsg() << endl;
err << " file: " << fe.file() << endl;
err << " line: " << fe.line() << endl;
err << " mesg: " << fe.errmsg() << endl;
uwarn << err.str() << endl;
throw ORepFailed(err.str());
}
......
......@@ -396,7 +396,7 @@ namespace UniSetTypes
uri << "corbaname::" << getProp(nsnode, "host") << ":" << defPort;
if( !omni::omniInitialReferences::setFromArgs(ns_name.str().c_str(), uri.str().c_str()) )
cerr << "**********************!!!! FAILED ADD name=" << ns_name << " uri=" << uri.str() << endl;
cerr << "**********************!!!! FAILED ADD name=" << ns_name.str() << " uri=" << uri.str() << endl;
}
i++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment