gtkmathview r1185 - in trunk: . src/backend/common src/common src/engine/mathml

[luca svn gnome org]

Author: luca
Date: Mon Mar 23 17:34:14 2009
New Revision: 1185
URL: http://svn.gnome.org/viewvc/gtkmathview?rev=1185&view=rev

Log:
+ small fixes for removing gcc warnings


Modified:
   trunk/configure.ac
   trunk/src/backend/common/ComputerModernShaper.cc
   trunk/src/common/HashMap.hh
   trunk/src/engine/mathml/MathMLTableFormatter.cc

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Mar 23 17:34:14 2009
@@ -252,6 +252,16 @@
 
 AC_LANG_PUSH(C++)
 
+AC_CHECK_HEADERS(unordered_map,
+	[
+		AC_DEFINE(GMV_HAVE_UNORDERED_MAP,1,[Define if <unordered_map> is provided])
+		GMV_HAVE_UNORDERED_MAP_CFLAGS=-DGMV_HAVE_UNORDERED_MAP=1
+	],
+	[
+		GMV_HAVE_UNORDERED_MAP_CFLAGS=
+	]
+)
+AC_SUBST(GMV_HAVE_UNORDERED_MAP_CFLAGS)
 AC_CHECK_HEADERS(hash_map,
 	[
 		AC_DEFINE(GMV_HAVE_HASH_MAP,1,[Define if <hash_map> is provided])

Modified: trunk/src/backend/common/ComputerModernShaper.cc
==============================================================================
--- trunk/src/backend/common/ComputerModernShaper.cc	(original)
+++ trunk/src/backend/common/ComputerModernShaper.cc	Mon Mar 23 17:34:14 2009
@@ -582,7 +582,7 @@
   };
 #endif
 
-static ComputerModernShaper::PlainChar cmsMap[] =
+static ComputerModernShaper::PlainChar32 cmsMap[] =
   {
     { 0x007B, 0x66 },  // LEFT CURLY BRACKET
     { 0x007D, 0x67 },  // RIGHT CURLY BRACKET

Modified: trunk/src/common/HashMap.hh
==============================================================================
--- trunk/src/common/HashMap.hh	(original)
+++ trunk/src/common/HashMap.hh	Mon Mar 23 17:34:14 2009
@@ -24,14 +24,17 @@
 #define __HashMap_hh__
 
 // !!! BEGIN WARNING: hash_map is not part of the STL !!!
-#if defined(GMV_HAVE_EXT_HASH_MAP)
+#if defined(GMV_HAVE_UNORDERED_MAP)
+  #include <unordered_map>
+#define HASH_MAP_NS std
+#elif defined(GMV_HAVE_EXT_HASH_MAP)
   #include <ext/hash_map>
 #define HASH_MAP_NS __gnu_cxx
 #elif defined(GMV_HAVE_HASH_MAP)
   #include <hash_map>
 #define HASH_MAP_NS std
 #else
-#error "no implementation of hash_map could be found"
+#error "no implementation of unordered_map or hash_map could be found"
 #endif
 // !!! END WARNING: hash_map is not part of the STL !!!
 

Modified: trunk/src/engine/mathml/MathMLTableFormatter.cc
==============================================================================
--- trunk/src/engine/mathml/MathMLTableFormatter.cc	(original)
+++ trunk/src/engine/mathml/MathMLTableFormatter.cc	Mon Mar 23 17:34:14 2009
@@ -102,9 +102,6 @@
   equalRows = ToBoolean(equalRowsV);
   equalColumns = ToBoolean(equalColumnsV);
 
-  assert(nGridRows >= 0);
-  assert(nGridColumns >= 0);
-
 #if 0
   std::cerr << "CI SIAMO: " << nRows << "x" << nColumns << std::endl
 	    << "grid: " << nGridRows << "x" << nGridColumns << std::endl