summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-22 18:00:38 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-22 18:00:38 +0000
commit4b2531894ce08e3dfd31e7bb3e734935d9d468ab (patch)
treeefb0884edcc97c8b3532d78f9c3c3686670477b9 /ace
parentc6382c891efb6fa2306df0f31f8b77a69a6c12d7 (diff)
downloadATCD-4b2531894ce08e3dfd31e7bb3e734935d9d468ab.tar.gz
moved ACE_IO_Vector declaration ahead of OS.i #include
Diffstat (limited to 'ace')
-rw-r--r--ace/OS.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/ace/OS.h b/ace/OS.h
index d0b9bfbd1b3..bc5cb46b10f 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -4470,11 +4470,11 @@ public:
int iovcnt);
#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
- static ssize_t writev (ACE_HANDLE handle,
- const WSABUF *buffers,
+ static ssize_t writev (ACE_HANDLE handle,
+ const WSABUF *buffers,
int n);
- static ssize_t readv (ACE_HANDLE handle,
- WSABUF *buffers,
+ static ssize_t readv (ACE_HANDLE handle,
+ WSABUF *buffers,
int n);
#endif /* ACE_HAS_WINSOCK2 */
@@ -5604,6 +5604,26 @@ private:
# define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP ; return FAILVALUE; } while (0)
#endif /* ! ACE_HAS_VERBOSE_NOTSUP */
+#if defined (ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS)
+# define ACE_INLINE_FOR_GNUC ACE_INLINE
+#else
+# define ACE_INLINE_FOR_GNUC
+#endif /* ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS */
+
+struct ACE_Export ACE_IO_Vector :
+#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
+ public WSABUF
+#else
+ public iovec
+#endif /* ACE_HAS_WINSOCK2 */
+{
+ ssize_t length (void) const;
+ void length (ssize_t new_length);
+
+ void *buffer (void) const;
+ void buffer (void *new_buffer);
+};
+
#if defined (UNICODE)
# if !defined (ACE_DEFAULT_NAMESPACE_DIR)
@@ -5672,7 +5692,7 @@ private:
# if defined (ASYS_INLINE)
# undef ASYS_INLINE
# endif /* ASYS_INLINE */
-# define ASYS_INLINE
+# define ASYS_INLINE
# if defined (ACE_HAS_INLINED_OSCALLS)
# undef ACE_HAS_INLINED_OSCALLS
# endif /* ACE_HAS_INLINED_OSCALLS */
@@ -5688,26 +5708,6 @@ private:
# include "ace/OS.i"
# endif /* ACE_HAS_INLINED_OSCALLS */
-#if defined (ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS)
-# define ACE_INLINE_FOR_GNUC ACE_INLINE
-#else
-# define ACE_INLINE_FOR_GNUC
-#endif /* ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS */
-
-struct ACE_Export ACE_IO_Vector :
-#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
- public WSABUF
-#else
- public iovec
-#endif /* ACE_HAS_WINSOCK2 */
-{
- ssize_t length (void) const;
- void length (ssize_t new_length);
-
- void *buffer (void) const;
- void buffer (void *new_buffer);
-};
-
#include "ace/Trace.h"
// These need to come here to avoid problems with circular dependencies.