diff options
| author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-26 19:54:08 +0000 |
|---|---|---|
| committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-26 19:54:08 +0000 |
| commit | 664244e804da11536f2712a61116204e8042f312 (patch) | |
| tree | c058324f9e24262a32f3e594054016c3f02046c5 /ace/DEV.h | |
| parent | d9d5d3d83831c9728147bfe5a2b53822d7ffca21 (diff) | |
| download | ATCD-664244e804da11536f2712a61116204e8042f312.tar.gz | |
Fixed merge related compile errors
Diffstat (limited to 'ace/DEV.h')
| -rw-r--r-- | ace/DEV.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ace/DEV.h b/ace/DEV.h index 69a92aaad1b..8b0c585ddf7 100644 --- a/ace/DEV.h +++ b/ace/DEV.h @@ -36,6 +36,8 @@ #define ACE_DEV_STREAM ACE_DEV_IO, ACE_DEV_Addr #endif /* ACE_TEMPLATE_TYPEDEFS */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class ACE_DEV * @@ -66,6 +68,8 @@ protected: ACE_DEV (void); }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ace/DEV.inl" #endif /* __ACE_INLINE__ */ |