# HG changeset patch
# User Rik <rik@octave.org>
# Date 1425081072 28800
# Node ID d575cd1e0da76b5ecb6b95b88c6d465510390e79
# Parent  ed5ee3f610db95d7f6061fcab95dcd7e7b35510d
Replace std::size_t with bare size_t for conformity to rest of code.

* gl2ps-renderer.cc (draw): Replace std::size_t with size_t.

* help.cc (size): Replace std::size_t with size_t.

* __fltk_uigetfile__.cc (F__fltk_uigetfile__): Replace std::size_t with size_t.

* __init_fltk__.cc (fltk_uimenu::find_index_by_name): Replace std::size_t with
size_t.

* audioread.cc (Faudiowrite): Replace std::size_t with size_t.

diff -r ed5ee3f610db -r d575cd1e0da7 libinterp/corefcn/gl2ps-renderer.cc
--- a/libinterp/corefcn/gl2ps-renderer.cc	Fri Feb 27 09:31:11 2015 -0800
+++ b/libinterp/corefcn/gl2ps-renderer.cc	Fri Feb 27 15:51:12 2015 -0800
@@ -80,15 +80,15 @@
           // outputs the tex-file and the graphic filename to be included is
           // extracted from old_print_cmd.
           std::string include_graph;
-          std::size_t found_redirect = old_print_cmd.find (">");
+          size_t found_redirect = old_print_cmd.find (">");
           if (found_redirect != std::string::npos)
             include_graph = old_print_cmd.substr (found_redirect + 1);
           else
             include_graph = old_print_cmd;
-          std::size_t n_begin = include_graph.find_first_not_of (" ");
+          size_t n_begin = include_graph.find_first_not_of (" ");
           if (n_begin != std::string::npos)
             {
-              std::size_t n_end = include_graph.find_last_not_of (" ");
+              size_t n_end = include_graph.find_last_not_of (" ");
               include_graph = include_graph.substr (n_begin,
                                                     n_end - n_begin + 1);
             }
diff -r ed5ee3f610db -r d575cd1e0da7 libinterp/corefcn/help.cc
--- a/libinterp/corefcn/help.cc	Fri Feb 27 09:31:11 2015 -0800
+++ b/libinterp/corefcn/help.cc	Fri Feb 27 15:51:12 2015 -0800
@@ -98,8 +98,8 @@
 typedef map_type::value_type pair_type;
 typedef map_type::const_iterator map_iter;
 
-template<typename T, std::size_t z>
-std::size_t
+template<typename T, size_t z>
+size_t
 size (T const (&)[z])
 {
   return z;
diff -r ed5ee3f610db -r d575cd1e0da7 libinterp/dldfcn/__fltk_uigetfile__.cc
--- a/libinterp/dldfcn/__fltk_uigetfile__.cc	Fri Feb 27 09:31:11 2015 -0800
+++ b/libinterp/dldfcn/__fltk_uigetfile__.cc	Fri Feb 27 15:51:12 2015 -0800
@@ -102,7 +102,7 @@
 
       //fltk uses forward slash even for windows
       std::string sep = "/";
-      std::size_t idx;
+      size_t idx;
 
       if (file_count == 1 && multi_type != Fl_File_Chooser::DIRECTORY)
         {
diff -r ed5ee3f610db -r d575cd1e0da7 libinterp/dldfcn/__init_fltk__.cc
--- a/libinterp/dldfcn/__init_fltk__.cc	Fri Feb 27 09:31:11 2015 -0800
+++ b/libinterp/dldfcn/__init_fltk__.cc	Fri Feb 27 15:51:12 2015 -0800
@@ -304,7 +304,7 @@
             // End of submenu? Pop back one level.
             if (! m->label ())
               {
-                std::size_t idx = menupath.find_last_of ("/");
+                size_t idx = menupath.find_last_of ("/");
                 if (idx != std::string::npos)
                   menupath.erase (idx);
                 else
@@ -519,8 +519,8 @@
             if (item)
               {
                 //avoid duplicate menulabels
-                std::size_t idx1 = fltk_label.find_last_of ("(");
-                std::size_t idx2 = fltk_label.find_last_of (")");
+                size_t idx1 = fltk_label.find_last_of ("(");
+                size_t idx2 = fltk_label.find_last_of (")");
                 int len = idx2 - idx1;
                 int val = 1;
                 if (len > 0)
diff -r ed5ee3f610db -r d575cd1e0da7 libinterp/dldfcn/audioread.cc
--- a/libinterp/dldfcn/audioread.cc	Fri Feb 27 09:31:11 2015 -0800
+++ b/libinterp/dldfcn/audioread.cc	Fri Feb 27 15:51:12 2015 -0800
@@ -332,7 +332,7 @@
     return retval;
 
   std::string ext;
-  std::size_t dotpos = filename.find_last_of (".");
+  size_t dotpos = filename.find_last_of (".");
   if (dotpos != std::string::npos)
     ext = filename.substr (dotpos + 1);
   std::transform (ext.begin (), ext.end (), ext.begin (), ::tolower);