[glom/glom-1-16] Build fixes after recent commits.



commit 082a28ec157eb84f312d5c596bd5ab121bd0748a
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Oct 14 11:32:22 2010 +0200

    Build fixes after recent commits.
    
    * glom/libglom/db_utils.cc:
    * glom/libglom/utils.cc:
    * glom/mode_data/datawidget/cellrenderer_dblist.cc: Adde back some
      includes of iostream and fix a size type.

 ChangeLog                |    9 +++++++++
 glom/libglom/db_utils.cc |    2 ++
 glom/libglom/utils.cc    |    2 +-
 3 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fda6f8b..c7b1f91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-14  Murray Cumming  <murrayc murrayc com>
+
+	Build fixes after recent commits.
+
+	* glom/libglom/db_utils.cc:
+	* glom/libglom/utils.cc:
+	* glom/mode_data/datawidget/cellrenderer_dblist.cc: Added back some
+  includes of iostream and fix a size type.
+
 2010-10-11  David King  <davidk openismus com>
 
 	Change some uses of long to more appropriate types
diff --git a/glom/libglom/db_utils.cc b/glom/libglom/db_utils.cc
index 9c60840..621d291 100644
--- a/glom/libglom/db_utils.cc
+++ b/glom/libglom/db_utils.cc
@@ -25,8 +25,10 @@
 #include <libglom/privs.h>
 #include <libglom/data_structure/parameternamegenerator.h>
 #include <libglom/utils.h>
+#include <libgdamm/value.h>
 #include <libgda/libgda.h> // For gda_g_type_from_string
 #include <glibmm/i18n.h>
+#include <iostream>
 
 namespace Glom
 {
diff --git a/glom/libglom/utils.cc b/glom/libglom/utils.cc
index 0693954..cd0a2ad 100644
--- a/glom/libglom/utils.cc
+++ b/glom/libglom/utils.cc
@@ -655,7 +655,7 @@ Glib::ustring Utils::create_local_image_uri(const Gnome::Gda::Value& value)
 
   if(value.get_value_type() == GDA_TYPE_BINARY)
   {
-    std::streamsize size = 0;
+    long size = 0;
     gconstpointer pData = value.get_binary(size);
     if(size && pData)
     {



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