epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

move FINAL/OVERRIDE defs to pvIntrospect.h

Browse Source
This commit is contained in:
Michael Davidsaver
2018-02-06 10:10:05 -08:00
parent 786575c3de
commit 2ab2fc62dc
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/pv/pvData.h
View File

@@ -33,31 +33,6 @@
typedef class std::ios std::ios_base;
#endif
/* C++11 keywords
@code
struct Base {
virtual void foo();
};
struct Class : public Base {
virtual void foo() OVERRIDE FINAL;
};
@endcode
*/
#ifndef FINAL
# if __cplusplus>=201103L
# define FINAL final
# else
# define FINAL
# endif
#endif
#ifndef OVERRIDE
# if __cplusplus>=201103L
# define OVERRIDE override
# else
# define OVERRIDE
# endif
#endif
namespace epics { namespace pvData {
/** @defgroup pvcontainer Value containers

25
src/pv/pvIntrospect.h
View File

@@ -21,6 +21,31 @@
#include <shareLib.h>
/* C++11 keywords
@code
struct Base {
virtual void foo();
};
struct Class : public Base {
virtual void foo() OVERRIDE FINAL;
};
@endcode
*/
#ifndef FINAL
# if __cplusplus>=201103L
# define FINAL final
# else
# define FINAL
# endif
#endif
#ifndef OVERRIDE
# if __cplusplus>=201103L
# define OVERRIDE override
# else
# define OVERRIDE
# endif
#endif
namespace epics { namespace pvData {
namespace format {