[glom] Some minor signed type corrections.



commit b9ed12fd3e66d251335e489ce7bf060822a83ae1
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jul 12 14:18:14 2011 +0200

    Some minor signed type corrections.
    
    	* glom/libglom/connectionpool_backends/postgres.cc:
    	* glom/xsl_utils.cc: Gio::FileOutputStream::write() returns a gssize, not a
    	gsize.

 ChangeLog                                        |    8 ++++++++
 glom/libglom/connectionpool_backends/postgres.cc |    4 ++--
 glom/xsl_utils.cc                                |    6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 073435d..cc7e1df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-07-12  Murray Cumming  <murrayc murrayc com>
 
+	Some minor signed type corrections.
+
+	* glom/libglom/connectionpool_backends/postgres.cc:
+	* glom/xsl_utils.cc: Gio::FileOutputStream::write() returns a gssize, not a 
+	gsize.
+
+2011-07-12  Murray Cumming  <murrayc murrayc com>
+
 	ImageGlom: Size request corrections.
 
 	* glom/utility_widgets/imageglom.cc: init(): Remove the set_size_request() 
diff --git a/glom/libglom/connectionpool_backends/postgres.cc b/glom/libglom/connectionpool_backends/postgres.cc
index b790b1d..674615e 100644
--- a/glom/libglom/connectionpool_backends/postgres.cc
+++ b/glom/libglom/connectionpool_backends/postgres.cc
@@ -854,7 +854,7 @@ bool Postgres::create_text_file(const std::string& file_uri, const std::string&
     return false;
 
 
-  gsize bytes_written = 0;
+  gssize bytes_written = 0;
   const std::string::size_type contents_size = contents.size();
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
@@ -877,7 +877,7 @@ bool Postgres::create_text_file(const std::string& file_uri, const std::string&
     return false; //print_error(ex, output_uri_string);
   }
 
-  if(bytes_written != contents_size)
+  if(bytes_written != (gssize)contents_size)
   {
     std::cerr << "ConnectionPool::create_text_file(): not all bytes written when writing to file." << std::endl
       << "  file uri:" << file_uri << std::endl;
diff --git a/glom/xsl_utils.cc b/glom/xsl_utils.cc
index 55cfc0a..413e68c 100644
--- a/glom/xsl_utils.cc
+++ b/glom/xsl_utils.cc
@@ -68,7 +68,7 @@ namespace Glom
 void GlomXslUtils::transform_and_open(const xmlpp::Document& xml_document, const Glib::ustring& xsl_file_path, Gtk::Window* parent_window)
 {
   //Use libxslt to convert the XML to HTML:
-  Glib::ustring result = xslt_process(xml_document, get_xslt_file(xsl_file_path));
+  const Glib::ustring result = xslt_process(xml_document, get_xslt_file(xsl_file_path));
   std::cout << "After xslt: " << result << std::endl;
 
   //Save it to a temporary file and show it in a browser:
@@ -100,7 +100,7 @@ void GlomXslUtils::transform_and_open(const xmlpp::Document& xml_document, const
   }
 
   //Write the data to the output uri
-  gsize bytes_written = 0;
+  gssize bytes_written = 0;
   const Glib::ustring::size_type result_bytes = result.bytes();
   try
   {
@@ -112,7 +112,7 @@ void GlomXslUtils::transform_and_open(const xmlpp::Document& xml_document, const
     return; // false; //print_error(ex, output_uri_string);
   }
 
-  if(bytes_written != result_bytes)
+  if(bytes_written != (gssize)result_bytes)
     return; //false
 
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]