Mercurial > octave

diff liboctave/system/oct-syscalls.h @ 21609:46f059de4dce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use namespace instead of struct with static members for system call wrappers * oct-syscalls.h, oct-syscalls.cc: Use octave::syscalls namespace instead of struct with static members. Change all uses.
author John W. Eaton <jwe@octave.org>
date Mon, 11 Apr 2016 14:39:02 -0400
parents 1473547f50f5
children e0da98857c19
line wrap: on
line diff
--- a/liboctave/system/oct-syscalls.h	Mon Apr 11 13:53:17 2016 -0400
+++ b/liboctave/system/oct-syscalls.h	Mon Apr 11 14:39:02 2016 -0400
@@ -31,47 +31,61 @@
 
 #include <sys/types.h>
 
-struct
-OCTAVE_API
-octave_syscalls
+namespace
+octave
 {
-  static int dup2 (int, int);
-  static int dup2 (int, int, std::string&);
+  namespace
+  syscalls
+  {
+    extern OCTAVE_API int dup2 (int, int);
+    extern OCTAVE_API int dup2 (int, int, std::string&);
+
+    extern OCTAVE_API int execvp (const std::string&, const string_vector&);
+    extern OCTAVE_API int execvp (const std::string&, const string_vector&,
+                                  std::string&);
 
-  static int execvp (const std::string&, const string_vector&);
-  static int execvp (const std::string&, const string_vector&, std::string&);
+    extern OCTAVE_API pid_t fork (std::string&);
+
+    extern OCTAVE_API pid_t vfork (std::string&);
+
+    extern OCTAVE_API pid_t getpgrp (std::string&);
 
-  static pid_t fork (std::string&);
-  static pid_t vfork (std::string&);
+    extern OCTAVE_API pid_t getpid (void);
+
+    extern OCTAVE_API pid_t getppid (void);
 
-  static pid_t getpgrp (std::string&);
+    extern OCTAVE_API gid_t getgid (void);
 
-  static pid_t getpid (void);
-  static pid_t getppid (void);
+    extern OCTAVE_API gid_t getegid (void);
 
-  static gid_t getgid (void);
-  static gid_t getegid (void);
+    extern OCTAVE_API uid_t getuid (void);
+
+    extern OCTAVE_API uid_t geteuid (void);
 
-  static uid_t getuid (void);
-  static uid_t geteuid (void);
+    extern OCTAVE_API int pipe (int *);
+    extern OCTAVE_API int pipe (int *, std::string&);
 
-  static int pipe (int *);
-  static int pipe (int *, std::string&);
+    extern OCTAVE_API pid_t waitpid (pid_t, int *status, int);
+    extern OCTAVE_API pid_t waitpid (pid_t, int *status, int, std::string&);
+
+    extern OCTAVE_API int kill (pid_t, int);
+    extern OCTAVE_API int kill (pid_t, int, std::string&);
 
-  static pid_t waitpid (pid_t, int *status, int);
-  static pid_t waitpid (pid_t, int *status, int, std::string&);
+    extern OCTAVE_API pid_t
+    popen2 (const std::string&, const string_vector&, bool, int *);
 
-  static int kill (pid_t, int);
-  static int kill (pid_t, int, std::string&);
+    extern OCTAVE_API pid_t
+    popen2 (const std::string&, const string_vector&, bool, int *,
+            std::string&);
 
-  static pid_t popen2 (const std::string&, const string_vector&, bool, int *);
-  static pid_t popen2 (const std::string&, const string_vector&, bool, int *,
-                       std::string&);
-  static pid_t popen2 (const std::string&, const string_vector&, bool, int *,
-                       std::string&, bool &interactive);
-};
+    extern OCTAVE_API pid_t
+    popen2 (const std::string&, const string_vector&, bool, int *,
+            std::string&, bool &interactive);
+
+    extern OCTAVE_API int fcntl (int, int, long);
+    extern OCTAVE_API int fcntl (int, int, long, std::string&);
+  }
+}
 
 #endif
 
-extern OCTAVE_API int octave_fcntl (int, int, long);
-extern OCTAVE_API int octave_fcntl (int, int, long, std::string&);