[glom] Fix the build.



commit 5f44ae901ac6ba3480a472d21a83206f7f054a58
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Mar 14 09:21:43 2011 +0100

    Fix the build.
    
    * glom/libglom/init.cc: Add an include so we can use std::cerr.

 ChangeLog            |   20 +++++++++++++-------
 glom/libglom/init.cc |    8 ++++----
 2 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0d159a4..2b14511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28 +1,34 @@
 2011-03-14  Murray Cumming  <murrayc murrayc com>
 
+	Fix the build.
+
+	* glom/libglom/init.cc: Add an include so we can use std::cerr.
+
+2011-03-14  Murray Cumming  <murrayc murrayc com>
+
 	libglom_init(): Show the python exception when PyDateTime_IMPORT fails.
 
-	* glom/libglom/init.cc: The linker seems to behave differently when this 
+	* glom/libglom/init.cc: The linker seems to behave differently when this
 	code is run from inside a JVM in OnlineGlom. This gives us a clue.
 
 2011-03-12  Murray Cumming  <murrayc murrayc com>
 
 	Fix crashes when using choices with fixed lists.
 
-	* glom/mode_data/datawidget/combochoiceswithtreemodel.[h|cc]: 
-	create_model_non_db(): Instead of creating just a text-based treemodel, 
-	create a Value-based one with an extra text column at the end. That is what 
+	* glom/mode_data/datawidget/combochoiceswithtreemodel.[h|cc]:
+	create_model_non_db(): Instead of creating just a text-based treemodel,
+	create a Value-based one with an extra text column at the end. That is what
 	the related-records model has, though it uses a custom TreeModel.
 	The text column is needed for GtkComboBox when it has has-entry=true:
 	(See https://bugzilla.gnome.org/show_bug.cgi?id=631167 )
-	Add get_fixed_model_text_column() so that other code knows which column that 
+	Add get_fixed_model_text_column() so that other code knows which column that
 	is.
 	* glom/mode_data/datawidget/cellrenderer_dblist.cc: set_choices_fixed(),
 	repack_cells_fixed():
 	* glom/mode_data/datawidget/combo.cc:	set_choices_fixed():
-	Adapt to use the special column instead of assuming that column 0 is a text 
+	Adapt to use the special column instead of assuming that column 0 is a text
 	column.
-	Previously Glom::Combo::set_value() crashed because we tried to get a 
+	Previously Glom::Combo::set_value() crashed because we tried to get a
 	Value<Gnome::Gda::Value> where there was a Value<ustring>.
 
 2011-03-08  Murray Cumming  <murrayc murrayc com>
diff --git a/glom/libglom/init.cc b/glom/libglom/init.cc
index f9e8e6c..4e2d45a 100644
--- a/glom/libglom/init.cc
+++ b/glom/libglom/init.cc
@@ -26,6 +26,7 @@
 #include <glom/libglom/connectionpool.h>
 #include <giomm.h>
 #include <libgdamm.h>
+#include <iostream>
 
 
 //TODO: Remove this redefine when Python fixes the compiler error in their macro:
@@ -51,9 +52,9 @@ void libglom_init()
   if(!PyDateTimeAPI)
   {
     //Give people a clue on stdout:
-    std::cerr << G_STRFUNC << ": PyDateTime_IMPORT (a python module import) failed." << std::endl; 
-    
-    //This gives more information. When this happens it is generally a linker 
+    std::cerr << G_STRFUNC << ": PyDateTime_IMPORT (a python module import) failed." << std::endl;
+
+    //This gives more information. When this happens it is generally a linker
     //failure while importing a python module:
     PyErr_Print();
   }
@@ -70,4 +71,3 @@ void libglom_deinit()
 }
 
 } //namespace Glom
-



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