Mercurial > octave

diff liboctave/util/lo-utils.h @ 31606:dfa5d9c3ae72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 14:28:07 -0800
parents 9a0ce9eea1b7 e88a07dec498
children 23664317f0d3
line wrap: on
line diff
--- a/liboctave/util/lo-utils.h	Thu Dec 01 14:01:16 2022 -0800
+++ b/liboctave/util/lo-utils.h	Thu Dec 01 14:28:07 2022 -0800
@@ -36,8 +36,8 @@
 #include "oct-cmplx.h"
 #include "quit.h"
 
-namespace octave
-{
+OCTAVE_BEGIN_NAMESPACE(octave)
+
   // Generic any/all test functionality with arbitrary predicate.
 
   template <typename F, typename T, bool zero>
@@ -109,8 +109,8 @@
   template <> OCTAVE_API void write_value (std::ostream& os, const float& value);
   template <> OCTAVE_API void write_value (std::ostream& os, const FloatComplex& value);
 
-  namespace math
-  {
+OCTAVE_BEGIN_NAMESPACE(math)
+
     extern OCTAVE_API bool int_multiply_overflow (int a, int b, int *r);
 
     extern OCTAVE_API bool
@@ -133,7 +133,8 @@
     int_multiply_overflow (unsigned long long int a, unsigned long long int b,
                            unsigned long long int *r);
 #endif
-  }
-}
+
+OCTAVE_END_NAMESPACE(math)
+OCTAVE_END_NAMESPACE(octave)
 
 #endif