--- a/libinterp/parse-tree/pt-bp.h	Thu Jan 19 14:47:19 2017 -0500
+++ b/libinterp/parse-tree/pt-bp.h	Thu Jan 19 23:41:54 2017 -0500
@@ -31,152 +31,160 @@
 #include "pt-pr-code.h"
 #include "interpreter.h"
 
-class tree;
-class tree_decl_command;
+namespace octave
+{
+  class tree;
+  class tree_decl_command;
 
-class
-tree_breakpoint : public tree_walker
-{
-public:
+  class tree_breakpoint : public tree_walker
+  {
+  public:
 
-  enum action { set = 1, clear = 2, list = 3 };
+    enum action { set = 1, clear = 2, list = 3 };
 
-  tree_breakpoint (int l, action a, const std::string& c = "")
-    : line (l), act (a), condition (c), found (false), bp_list () { }
+    tree_breakpoint (int l, action a, const std::string& c = "")
+      : line (l), act (a), condition (c), found (false), bp_list () { }
 
-  // No copying!
+    // No copying!
 
-  tree_breakpoint (const tree_breakpoint&) = delete;
+    tree_breakpoint (const tree_breakpoint&) = delete;
 
-  tree_breakpoint& operator = (const tree_breakpoint&) = delete;
+    tree_breakpoint& operator = (const tree_breakpoint&) = delete;
 
-  ~tree_breakpoint (void) = default;
+    ~tree_breakpoint (void) = default;
 
-  bool success (void) const { return found; }
+    bool success (void) const { return found; }
 
-  void visit_argument_list (tree_argument_list&);
+    void visit_argument_list (tree_argument_list&);
+
+    void visit_binary_expression (tree_binary_expression&);
 
-  void visit_binary_expression (tree_binary_expression&);
+    void visit_break_command (tree_break_command&);
 
-  void visit_break_command (tree_break_command&);
+    void visit_colon_expression (tree_colon_expression&);
 
-  void visit_colon_expression (tree_colon_expression&);
+    void visit_continue_command (tree_continue_command&);
 
-  void visit_continue_command (tree_continue_command&);
+    void visit_global_command (tree_global_command&);
 
-  void visit_global_command (tree_global_command&);
+    void visit_persistent_command (tree_persistent_command&);
 
-  void visit_persistent_command (tree_persistent_command&);
+    void visit_decl_elt (tree_decl_elt&);
 
-  void visit_decl_elt (tree_decl_elt&);
+    void visit_decl_init_list (tree_decl_init_list&);
 
-  void visit_decl_init_list (tree_decl_init_list&);
+    void visit_while_command (tree_while_command&);
 
-  void visit_while_command (tree_while_command&);
+    void visit_do_until_command (tree_do_until_command&);
 
-  void visit_do_until_command (tree_do_until_command&);
+    void visit_simple_for_command (tree_simple_for_command&);
 
-  void visit_simple_for_command (tree_simple_for_command&);
+    void visit_complex_for_command (tree_complex_for_command&);
 
-  void visit_complex_for_command (tree_complex_for_command&);
+    void visit_octave_user_script (octave_user_script&);
 
-  void visit_octave_user_script (octave_user_script&);
+    void visit_octave_user_function (octave_user_function&);
 
-  void visit_octave_user_function (octave_user_function&);
+    void visit_octave_user_function_header (octave_user_function&);
 
-  void visit_octave_user_function_header (octave_user_function&);
+    void visit_octave_user_function_trailer (octave_user_function&);
 
-  void visit_octave_user_function_trailer (octave_user_function&);
+    void visit_function_def (tree_function_def&);
 
-  void visit_function_def (tree_function_def&);
+    void visit_identifier (tree_identifier&);
 
-  void visit_identifier (tree_identifier&);
+    void visit_if_clause (tree_if_clause&);
 
-  void visit_if_clause (tree_if_clause&);
+    void visit_if_command (tree_if_command&);
 
-  void visit_if_command (tree_if_command&);
+    void visit_if_command_list (tree_if_command_list&);
 
-  void visit_if_command_list (tree_if_command_list&);
+    void visit_index_expression (tree_index_expression&);
 
-  void visit_index_expression (tree_index_expression&);
+    void visit_matrix (tree_matrix&);
 
-  void visit_matrix (tree_matrix&);
+    void visit_cell (tree_cell&);
 
-  void visit_cell (tree_cell&);
+    void visit_multi_assignment (tree_multi_assignment&);
 
-  void visit_multi_assignment (tree_multi_assignment&);
+    void visit_no_op_command (tree_no_op_command&);
 
-  void visit_no_op_command (tree_no_op_command&);
+    void visit_anon_fcn_handle (tree_anon_fcn_handle&);
 
-  void visit_anon_fcn_handle (tree_anon_fcn_handle&);
+    void visit_constant (tree_constant&);
 
-  void visit_constant (tree_constant&);
+    void visit_fcn_handle (tree_fcn_handle&);
 
-  void visit_fcn_handle (tree_fcn_handle&);
+    void visit_funcall (tree_funcall&);
 
-  void visit_funcall (tree_funcall&);
+    void visit_parameter_list (tree_parameter_list&);
 
-  void visit_parameter_list (tree_parameter_list&);
+    void visit_postfix_expression (tree_postfix_expression&);
 
-  void visit_postfix_expression (tree_postfix_expression&);
+    void visit_prefix_expression (tree_prefix_expression&);
 
-  void visit_prefix_expression (tree_prefix_expression&);
+    void visit_return_command (tree_return_command&);
 
-  void visit_return_command (tree_return_command&);
+    void visit_return_list (tree_return_list&);
 
-  void visit_return_list (tree_return_list&);
+    void visit_simple_assignment (tree_simple_assignment&);
 
-  void visit_simple_assignment (tree_simple_assignment&);
+    void visit_statement (tree_statement&);
 
-  void visit_statement (tree_statement&);
+    void visit_statement_list (tree_statement_list&);
+
+    void visit_switch_case (tree_switch_case&);
 
-  void visit_statement_list (tree_statement_list&);
+    void visit_switch_case_list (tree_switch_case_list&);
 
-  void visit_switch_case (tree_switch_case&);
+    void visit_switch_command (tree_switch_command&);
 
-  void visit_switch_case_list (tree_switch_case_list&);
+    void visit_try_catch_command (tree_try_catch_command&);
 
-  void visit_switch_command (tree_switch_command&);
+    void visit_unwind_protect_command (tree_unwind_protect_command&);
 
-  void visit_try_catch_command (tree_try_catch_command&);
+    octave_value_list get_list (void) { return bp_list; }
+    octave_value_list get_cond_list (void) { return bp_cond_list; }
 
-  void visit_unwind_protect_command (tree_unwind_protect_command&);
+    int get_line (void) { return found ? line : 0; }
+
+  private:
 
-  octave_value_list get_list (void) { return bp_list; }
-  octave_value_list get_cond_list (void) { return bp_cond_list; }
+    void do_decl_command (tree_decl_command&);
 
-  int get_line (void) { return found ? line : 0; }
-
-private:
+    void take_action (tree& tr);
 
-  void do_decl_command (tree_decl_command&);
+    void take_action (tree_statement& stmt);
 
-  void take_action (tree& tr);
+    // Statement line number we are looking for.
+    int line;
 
-  void take_action (tree_statement& stmt);
+    // What to do.
+    action act;
 
-  // Statement line number we are looking for.
-  int line;
+    // Expression which must be true to break
+    std::string condition;
 
-  // What to do.
-  action act;
+    // Have we already found the line?
+    bool found;
 
-  // Expression which must be true to break
-  std::string condition;
+    // List of breakpoint line numbers.
+    octave_value_list bp_list;
 
-  // Have we already found the line?
-  bool found;
+    // List of breakpoint conditions.
+    octave_value_list bp_cond_list;
+  };
 
-  // List of breakpoint line numbers.
-  octave_value_list bp_list;
+  // TRUE means SIGINT should put us in the debugger at the next
+  // available breakpoint.
+  extern bool octave_debug_on_interrupt_state;
+}
 
-  // List of breakpoint conditions.
-  octave_value_list bp_cond_list;
-};
+#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
 
-// TRUE means SIGINT should put us in the debugger at the next
-// available breakpoint.
-extern bool octave_debug_on_interrupt_state;
+OCTAVE_DEPRECATED ("use 'octave::tree_breakpoint' instead")
+typedef octave::tree_breakpoint tree_breakpoint;
 
 #endif
 
+#endif