changeset 21734:11af9c03400c

write namespace keyword and name on same line in C++ files
author John W. Eaton <jwe@octave.org>
date Thu, 19 May 2016 01:00:37 -0400
parents cb0fdd941d84
children 60212efcd9cb
files libinterp/corefcn/jit-typeinfo.h liboctave/system/file-ops.cc liboctave/system/file-ops.h liboctave/system/oct-env.cc liboctave/system/oct-env.h liboctave/system/oct-group.cc liboctave/system/oct-group.h liboctave/system/oct-passwd.cc liboctave/system/oct-passwd.h liboctave/system/oct-syscalls.cc liboctave/system/oct-syscalls.h liboctave/system/oct-time.cc liboctave/system/oct-time.h liboctave/system/oct-uname.cc liboctave/system/oct-uname.h liboctave/util/lo-ieee.h liboctave/util/oct-glob.cc liboctave/util/oct-glob.h
diffstat 18 files changed, 33 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/jit-typeinfo.h	Thu May 19 00:33:18 2016 -0400
+++ b/libinterp/corefcn/jit-typeinfo.h	Thu May 19 01:00:37 2016 -0400
@@ -110,8 +110,7 @@
 std::ostream& operator << (std::ostream& os, const jit_matrix& mat);
 
 // calling convention
-namespace
-jit_convention
+namespace jit_convention
 {
   enum
   type
--- a/liboctave/system/file-ops.cc	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/file-ops.cc	Thu May 19 01:00:37 2016 -0400
@@ -58,11 +58,9 @@
 #  include <algorithm>
 #endif
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     file_ops *octave::sys::file_ops::instance = 0;
 
--- a/liboctave/system/file-ops.h	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/file-ops.h	Thu May 19 01:00:37 2016 -0400
@@ -31,11 +31,9 @@
 
 #include "str-vec.h"
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     struct
     OCTAVE_API
--- a/liboctave/system/oct-env.cc	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-env.cc	Thu May 19 01:00:37 2016 -0400
@@ -60,11 +60,9 @@
 #include "oct-syscalls.h"
 #include "singleton-cleanup.h"
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     env::env (void)
       : follow_symbolic_links (true), verbatim_pwd (true),
--- a/liboctave/system/oct-env.h	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-env.h	Thu May 19 01:00:37 2016 -0400
@@ -27,11 +27,9 @@
 
 #include <string>
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     class
     OCTAVE_API
--- a/liboctave/system/oct-group.cc	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-group.cc	Thu May 19 01:00:37 2016 -0400
@@ -44,11 +44,9 @@
   (*current_liboctave_error_handler) ("invalid group object");
 }
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     std::string
     group::name (void) const
--- a/liboctave/system/oct-group.h	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-group.h	Thu May 19 01:00:37 2016 -0400
@@ -31,11 +31,9 @@
 
 #include "str-vec.h"
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     class
     OCTAVE_API
--- a/liboctave/system/oct-passwd.cc	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-passwd.cc	Thu May 19 01:00:37 2016 -0400
@@ -43,11 +43,9 @@
   (*current_liboctave_error_handler) ("invalid password object");
 }
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     std::string
     password::name (void) const
--- a/liboctave/system/oct-passwd.h	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-passwd.h	Thu May 19 01:00:37 2016 -0400
@@ -29,11 +29,9 @@
 
 #include <sys/types.h>
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     class
     OCTAVE_API
--- a/liboctave/system/oct-syscalls.cc	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-syscalls.cc	Thu May 19 01:00:37 2016 -0400
@@ -49,8 +49,7 @@
 
 namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     int
     dup2 (int old_fd, int new_fd)
--- a/liboctave/system/oct-syscalls.h	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-syscalls.h	Thu May 19 01:00:37 2016 -0400
@@ -31,11 +31,9 @@
 
 #include <sys/types.h>
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     extern OCTAVE_API int dup2 (int, int);
     extern OCTAVE_API int dup2 (int, int, std::string&);
--- a/liboctave/system/oct-time.cc	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-time.cc	Thu May 19 01:00:37 2016 -0400
@@ -40,11 +40,9 @@
 #include "oct-locbuf.h"
 #include "oct-time.h"
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     time::time (double d)
       : ot_unix_time (static_cast<time_t> (d)), ot_usec (0)
--- a/liboctave/system/oct-time.h	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-time.h	Thu May 19 01:00:37 2016 -0400
@@ -28,11 +28,9 @@
 #include <ctime>
 #include <string>
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     class base_tm;
 
--- a/liboctave/system/oct-uname.cc	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-uname.cc	Thu May 19 01:00:37 2016 -0400
@@ -31,11 +31,9 @@
 
 #include "oct-uname.h"
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     void
     uname::init (void)
--- a/liboctave/system/oct-uname.h	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/system/oct-uname.h	Thu May 19 01:00:37 2016 -0400
@@ -27,11 +27,9 @@
 
 #include <string>
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     class
     OCTAVE_API
--- a/liboctave/util/lo-ieee.h	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/util/lo-ieee.h	Thu May 19 01:00:37 2016 -0400
@@ -117,8 +117,7 @@
 
 #if defined (__cplusplus)
 
-namespace
-octave
+namespace octave
 {
   template <typename T>
   struct numeric_limits
--- a/liboctave/util/oct-glob.cc	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/util/oct-glob.cc	Thu May 19 01:00:37 2016 -0400
@@ -47,11 +47,9 @@
   return s.exists ();
 }
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     bool
     fnmatch (const string_vector& pat, const std::string& str, int fnm_flags)
--- a/liboctave/util/oct-glob.h	Thu May 19 00:33:18 2016 -0400
+++ b/liboctave/util/oct-glob.h	Thu May 19 01:00:37 2016 -0400
@@ -27,11 +27,9 @@
 
 #include "str-vec.h"
 
-namespace
-octave
+namespace octave
 {
-  namespace
-  sys
+  namespace sys
   {
     extern bool
     fnmatch (const string_vector& pat, const std::string& str,