Mercurial > octave

diff libinterp/octave-value/cdef-utils.h @ 26774:568c2ab2782d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move classdef classes inside octave namespace * cdef-class.cc, cdef-class.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h: Move classes inside octave namespace. * interpreter-private.h, ls-mat5.cc, ov-classdef.cc, ov-classdef.h, Array-tc.cc: Adapt to changed scoping.
author John W. Eaton <jwe@octave.org>
date Fri, 22 Feb 2019 16:02:09 +0000
parents d1419ac09564
children b442ec6dda5c
line wrap: on
line diff
--- a/libinterp/octave-value/cdef-utils.h	Fri Feb 22 15:40:15 2019 +0000
+++ b/libinterp/octave-value/cdef-utils.h	Fri Feb 22 16:02:09 2019 +0000
@@ -29,62 +29,81 @@
 #include <string>
 
 class octave_value;
-class cdef_class;
-class cdef_package;
 class Cell;
 
-extern std::string
-get_base_name (const std::string& nm);
-
-extern void
-make_function_of_class (const std::string& class_name,
-                        const octave_value& fcn);
-
-extern void
-make_function_of_class (const cdef_class& cls, const octave_value& fcn);
+namespace octave
+{
+  class cdef_class;
+  class cdef_package;
 
-extern cdef_class
-lookup_class (const std::string& name, bool error_if_not_found = true,
-              bool load_if_not_found = true);
-
-extern cdef_class
-lookup_class (const cdef_class& cls);
-
-extern cdef_class
-lookup_class (const octave_value& ov);
+  extern std::string
+  get_base_name (const std::string& nm);
 
-extern std::list<cdef_class>
-lookup_classes (const Cell& cls_list);
-
-extern octave_value
-to_ov (const std::list<cdef_class>& class_list);
-
-extern bool
-is_dummy_method (const octave_value& fcn);
+  extern void
+  make_function_of_class (const std::string& class_name,
+                          const octave_value& fcn);
 
-extern bool
-is_superclass (const cdef_class& clsa, const cdef_class& clsb,
-               bool allow_equal = true, int max_depth = -1);
-extern bool
-is_strict_superclass (const cdef_class& clsa, const cdef_class& clsb);
+  extern void
+  make_function_of_class (const cdef_class& cls, const octave_value& fcn);
 
-extern bool
-is_direct_superclass (const cdef_class& clsa, const cdef_class& clsb);
-
-extern cdef_package
-lookup_package (const std::string& name, bool error_if_not_found = true,
+  extern cdef_class
+  lookup_class (const std::string& name, bool error_if_not_found = true,
                 bool load_if_not_found = true);
 
-extern cdef_class
-get_class_context (std::string& name, bool& in_constructor);
+  extern cdef_class
+  lookup_class (const cdef_class& cls);
+
+  extern cdef_class
+  lookup_class (const octave_value& ov);
+
+  extern std::list<cdef_class>
+  lookup_classes (const Cell& cls_list);
+
+  extern octave_value
+  to_ov (const cdef_object& obj);
 
-extern cdef_class
-get_class_context (void);
+  extern octave_value
+  to_ov (const octave_value& ov);
+
+  extern cdef_object
+  to_cdef (const octave_value& val);
+
+  extern cdef_object&
+  to_cdef_ref (const octave_value& val);
+
+  extern cdef_object
+  to_cdef (const cdef_object& obj);
+
+  extern octave_value
+  to_ov (const std::list<cdef_class>& class_list);
 
-extern bool
-check_access (const cdef_class& cls, const octave_value& acc,
-              const std::string& meth_name = "",
-              const std::string& prop_name = "",
-              bool is_prop_set = false);
+  extern bool
+  is_dummy_method (const octave_value& fcn);
+
+  extern bool
+  is_superclass (const cdef_class& clsa, const cdef_class& clsb,
+                 bool allow_equal = true, int max_depth = -1);
+  extern bool
+  is_strict_superclass (const cdef_class& clsa, const cdef_class& clsb);
+
+  extern bool
+  is_direct_superclass (const cdef_class& clsa, const cdef_class& clsb);
+
+  extern cdef_package
+  lookup_package (const std::string& name, bool error_if_not_found = true,
+                  bool load_if_not_found = true);
+
+  extern cdef_class
+  get_class_context (std::string& name, bool& in_constructor);
+
+  extern cdef_class
+  get_class_context (void);
+
+  extern bool
+  check_access (const cdef_class& cls, const octave_value& acc,
+                const std::string& meth_name = "",
+                const std::string& prop_name = "",
+                bool is_prop_set = false);
+}
 
 #endif