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
72b69799
Commit
72b69799
authored
Sep 05, 2009
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ident and compile warning
parent
a147d903
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
10 deletions
+11
-10
JrnTest.cc
Utilities/JrnTests/JrnTest.cc
+1
-1
ctl-cpp-main-alone.xsl
Utilities/codegen/ctl-cpp-main-alone.xsl
+2
-2
ctl-cpp-main.xsl
Utilities/codegen/ctl-cpp-main.xsl
+1
-1
IOControl.cc
extensions/IOControl/IOControl.cc
+2
-2
IOControl.h
extensions/IOControl/IOControl.h
+3
-3
PassiveTimer.h
include/PassiveTimer.h
+2
-1
No files found.
Utilities/JrnTests/JrnTest.cc
View file @
72b69799
...
...
@@ -406,7 +406,7 @@ bool testJournal3()
for
(
int
i
=
0
;
i
<
10
;
i
++
)
{
if
(
j
.
readRow
(
i
,
&
ji
)
)
printf
(
"read i=%d j.id=%
d
\n
"
,
i
,
ji
.
id
);
printf
(
"read i=%d j.id=%
ld
\n
"
,
i
,
ji
.
id
);
else
printf
(
"read num=%d FAILED!
\n
"
,
i
);
...
...
Utilities/codegen/ctl-cpp-main-alone.xsl
View file @
72b69799
...
...
@@ -40,7 +40,7 @@ using namespace UniSetTypes;
// -----------------------------------------------------------------------------
int main( int argc,char* argv[] )
{
if( argc>1
&&
strcmp(argv[1],"--help")==0
)
if( argc>1
&&
!strcmp(argv[1],"--help")
)
{
cout
<<
"--name name - ID . IOController1."
<<
endl;
cout
<<
"--confile fname - . . configure.xml"
<<
endl;
...
...
@@ -62,7 +62,7 @@ int main( int argc,char* argv[] )
ObjectId ID(DefaultObjectId);
string name = conf->getArgParam("--name","
<xsl:value-of
select=
"normalize-space($OID)"
/>
");
if( !name.empty() )
ID = conf->getObjectID(name);
ID = conf->getObjectID(name);
if( ID == UniSetTypes::DefaultObjectId )
{
...
...
Utilities/codegen/ctl-cpp-main.xsl
View file @
72b69799
...
...
@@ -67,7 +67,7 @@ int main( int argc, const char** argv )
string name = conf->getArgParam("--name","
<xsl:value-of
select=
"$CLASSNAME"
/>
");
if( !name.empty() )
{
ID = conf->getObjectID(name);
ID = conf->getObjectID(name);
if( ID == UniSetTypes::DefaultObjectId )
{
cerr
<<
"(main): '"
<<
name
...
...
extensions/IOControl/IOControl.cc
View file @
72b69799
...
...
@@ -368,7 +368,7 @@ void IOControl::iopoll()
}
bool
prior
=
false
;
int
i
=
0
;
unsigned
int
i
=
0
;
for
(
IOMap
::
iterator
it
=
iomap
.
begin
();
it
!=
iomap
.
end
();
++
it
,
i
++
)
{
if
(
it
->
ignore
)
...
...
@@ -644,7 +644,7 @@ bool IOControl::check_item( UniXML_iterator& it )
return
false
;
// field = value
if
(
!
s_fvalue
.
empty
()
&&
it
.
getProp
(
s_field
)
!=
s_fvalue
)
if
(
!
s_fvalue
.
empty
()
&&
it
.
getProp
(
s_field
)
!=
s_fvalue
)
return
false
;
return
true
;
...
...
extensions/IOControl/IOControl.h
View file @
72b69799
...
...
@@ -214,10 +214,10 @@ class IOControl:
int
maxHeartBeat
;
IOController
::
AIOStateList
::
iterator
aitHeartBeat
;
bool
force
;
/*!< , SM, */
bool
force_out
;
/*!<
,
*/
bool
force
;
/*!<
,
, SM, */
bool
force_out
;
/*!<
,
*/
int
smReadyTimeout
;
/*!< SM , */
int
defCardNum
;
int
defCardNum
;
/*!< */
UniSetTypes
::
uniset_mutex
iopollMutex
;
bool
activated
;
...
...
include/PassiveTimer.h
View file @
72b69799
...
...
@@ -95,12 +95,13 @@ public:
virtual
bool
checkTime
();
/*!< */
virtual
timeout_t
setTiming
(
timeout_t
timeMS
);
/*!< */
virtual
timeout_t
setTiming
(
timeout_t
timeMS
);
/*!<
. timeMS = 0
*/
virtual
void
reset
();
/*!< */
virtual
timeout_t
getCurrent
();
/*!< , */
virtual
timeout_t
getInterval
()
/*!< , , */
{
// TODO: , -
if
(
timeSS
==
WaitUpTime
)
return
0
;
return
timeSS
*
10
;
...
...
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