Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
d534a6f8
Commit
d534a6f8
authored
Jun 20, 2015
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor fixes..
parent
bf87ff50
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
10 deletions
+10
-10
IOControl.cc
extensions/IOControl/IOControl.cc
+1
-1
Element.cc
extensions/LogicProcessor/Element.cc
+1
-1
Element.h
extensions/LogicProcessor/Element.h
+2
-2
DebugStream.cc
src/Log/DebugStream.cc
+1
-1
ORepHelpers.cc
src/ObjectRepository/ORepHelpers.cc
+4
-4
Configuration.cc
src/Various/Configuration.cc
+1
-1
No files found.
extensions/IOControl/IOControl.cc
View file @
d534a6f8
...
@@ -138,7 +138,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
...
@@ -138,7 +138,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
if
(
!
stype
.
empty
()
&&
st
==
ComediInterface
::
Unknown
)
if
(
!
stype
.
empty
()
&&
st
==
ComediInterface
::
Unknown
)
{
{
ostringstream
err
;
ostringstream
err
;
err
<<
"Unknown subdev type '"
<<
stype
<<
" for "
<<
t1
;
err
<<
"Unknown subdev type '"
<<
stype
<<
" for "
<<
t1
.
str
()
;
throw
SystemError
(
err
.
str
());
throw
SystemError
(
err
.
str
());
}
}
...
...
extensions/LogicProcessor/Element.cc
View file @
d534a6f8
...
@@ -61,7 +61,7 @@ void Element::setChildOut()
...
@@ -61,7 +61,7 @@ void Element::setChildOut()
it
.
el
->
setIn
(
it
.
num
,
_myout
);
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
)
for
(
const
auto
&
it
:
outs
)
{
{
...
...
extensions/LogicProcessor/Element.h
View file @
d534a6f8
...
@@ -13,7 +13,7 @@ class LogicException:
...
@@ -13,7 +13,7 @@ class LogicException:
{
{
public
:
public
:
LogicException
()
:
UniSetTypes
::
Exception
(
"LogicException"
)
{}
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
...
@@ -54,7 +54,7 @@ class Element
return
"?type?"
;
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
addChildOut
(
std
::
shared_ptr
<
Element
>
el
,
int
in_num
);
virtual
void
delChildOut
(
std
::
shared_ptr
<
Element
>
el
);
virtual
void
delChildOut
(
std
::
shared_ptr
<
Element
>
el
);
...
...
src/Log/DebugStream.cc
View file @
d534a6f8
...
@@ -88,7 +88,7 @@ DebugStream::~DebugStream()
...
@@ -88,7 +88,7 @@ DebugStream::~DebugStream()
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
const
DebugStream
&
DebugStream
::
operator
=
(
const
DebugStream
&
r
)
const
DebugStream
&
DebugStream
::
operator
=
(
const
DebugStream
&
r
)
{
{
if
(
r
==
*
this
)
if
(
&
r
==
this
)
return
*
this
;
return
*
this
;
dt
=
r
.
dt
;
dt
=
r
.
dt
;
...
...
src/ObjectRepository/ORepHelpers.cc
View file @
d534a6f8
...
@@ -124,10 +124,10 @@ namespace ORepHelpers
...
@@ -124,10 +124,10 @@ namespace ORepHelpers
{
{
ostringstream
err
;
ostringstream
err
;
err
<<
"OREPHELPER(getContext): поймали omniORB::fatalException:"
;
err
<<
"OREPHELPER(getContext): поймали omniORB::fatalException:"
;
uwarn
<<
err
<<
endl
;
err
<<
" file: "
<<
fe
.
file
()
<<
endl
;
uwarn
<<
" file: "
<<
fe
.
fil
e
()
<<
endl
;
err
<<
" line: "
<<
fe
.
lin
e
()
<<
endl
;
uwarn
<<
" line: "
<<
fe
.
line
()
<<
endl
;
err
<<
" mesg: "
<<
fe
.
errmsg
()
<<
endl
;
uwarn
<<
" mesg: "
<<
fe
.
errmsg
()
<<
endl
;
uwarn
<<
err
.
str
()
<<
endl
;
throw
ORepFailed
(
err
.
str
());
throw
ORepFailed
(
err
.
str
());
}
}
...
...
src/Various/Configuration.cc
View file @
d534a6f8
...
@@ -396,7 +396,7 @@ namespace UniSetTypes
...
@@ -396,7 +396,7 @@ namespace UniSetTypes
uri
<<
"corbaname::"
<<
getProp
(
nsnode
,
"host"
)
<<
":"
<<
defPort
;
uri
<<
"corbaname::"
<<
getProp
(
nsnode
,
"host"
)
<<
":"
<<
defPort
;
if
(
!
omni
::
omniInitialReferences
::
setFromArgs
(
ns_name
.
str
().
c_str
(),
uri
.
str
().
c_str
())
)
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
++
;
i
++
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment