Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
cs
ds
adio
Commits
e0c89ae8
Commit
e0c89ae8
authored
Nov 13, 2019
by
Graziano Scalamera
Browse files
Port to Tango 9
parent
2f11649d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
e0c89ae8
...
...
@@ -3,4 +3,4 @@ NAME_SRV = adio-srv
CXXFLAGS
=
LDFLAGS
=
include
../makefiles/Make-
8.1.2.c
.in
include
../makefiles/Make-
9.3.3
.in
src/Adio.cpp
View file @
e0c89ae8
...
...
@@ -113,19 +113,19 @@ namespace Adio_ns
//
//-----------------------------------------------------------------------------
Adio
::
Adio
(
Tango
::
DeviceClass
*
cl
,
string
&
s
)
:
T
ango
::
Device_4Impl
(
cl
,
s
.
c_str
())
:
T
ANGO_BASE_CLASS
(
cl
,
s
.
c_str
())
{
init_device
();
}
Adio
::
Adio
(
Tango
::
DeviceClass
*
cl
,
const
char
*
s
)
:
T
ango
::
Device_4Impl
(
cl
,
s
)
:
T
ANGO_BASE_CLASS
(
cl
,
s
)
{
init_device
();
}
Adio
::
Adio
(
Tango
::
DeviceClass
*
cl
,
const
char
*
s
,
const
char
*
d
)
:
T
ango
::
Device_4Impl
(
cl
,
s
,
d
)
:
T
ANGO_BASE_CLASS
(
cl
,
s
,
d
)
{
init_device
();
}
...
...
src/Adio.h
View file @
e0c89ae8
...
...
@@ -62,7 +62,7 @@ namespace Adio_ns
*/
class
Adio
:
public
T
ango
::
Device_4Impl
class
Adio
:
public
T
ANGO_BASE_CLASS
{
public
:
// Add your own data members here
...
...
src/AdioClass.cpp
View file @
e0c89ae8
...
...
@@ -1343,7 +1343,7 @@ void AdioClass::write_class_property()
// Put inheritance
Tango
::
DbDatum
inher_datum
(
"InheritedFrom"
);
vector
<
string
>
inheritance
;
inheritance
.
push_back
(
"
Device_4Impl
"
);
inheritance
.
push_back
(
"
TANGO_BASE_CLASS
"
);
inher_datum
<<
inheritance
;
data
.
push_back
(
inher_datum
);
...
...
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