r3868 - in trunk/birnet: . tests

[timj svn gnome org]

Author: timj
Date: 2006-08-24 16:29:00 -0400 (Thu, 24 Aug 2006)
New Revision: 3868

Modified:
   trunk/birnet/ChangeLog
   trunk/birnet/birnetcore.h
   trunk/birnet/birnetutilsxx.hh
   trunk/birnet/tests/signal.cc
Log:
Thu Aug 23 21:21:00 2006  Tim Janik  <timj gtk org>

        * birnetcore.h, birnetutilsxx.hh: always use global uint definition
        (either from types.h or from a fallback definition) to avoid
        ambiguities.




Modified: trunk/birnet/ChangeLog
===================================================================
--- trunk/birnet/ChangeLog	2006-08-24 19:30:59 UTC (rev 3867)
+++ trunk/birnet/ChangeLog	2006-08-24 20:29:00 UTC (rev 3868)
@@ -1,3 +1,9 @@
+Thu Aug 23 21:21:00 2006  Tim Janik  <timj gtk org>
+
+	* birnetcore.h, birnetutilsxx.hh: always use global uint definition
+	(either from types.h or from a fallback definition) to avoid
+	ambiguities.
+
 Mon Aug 21 01:03:24 2006  Tim Janik  <timj gtk org>
 
 	* birnetutils.h, birnetutils.c: added birnet_memset4(), a function to

Modified: trunk/birnet/birnetcore.h
===================================================================
--- trunk/birnet/birnetcore.h	2006-08-24 19:30:59 UTC (rev 3867)
+++ trunk/birnet/birnetcore.h	2006-08-24 20:29:00 UTC (rev 3868)
@@ -134,7 +134,7 @@
 /* --- convenient type shorthands --- */
 #ifdef  _BIRNET_SOURCE_EXTENSIONS
 #if 	BIRNET_SIZEOF_SYS_TYPESH_UINT == 0
-typedef BirnetUInt		uint;
+typedef unsigned int uint;	/* for systems that don't define uint in types.h */
 #else
 BIRNET_STATIC_ASSERT (BIRNET_SIZEOF_SYS_TYPESH_UINT == 4);
 #endif

Modified: trunk/birnet/birnetutilsxx.hh
===================================================================
--- trunk/birnet/birnetutilsxx.hh	2006-08-24 19:30:59 UTC (rev 3867)
+++ trunk/birnet/birnetutilsxx.hh	2006-08-24 20:29:00 UTC (rev 3868)
@@ -29,7 +29,7 @@
 
 /* --- convenient type shorthands --- */
 #ifdef  _BIRNET_SOURCE_EXTENSIONS
-using ::uint;
+// using ::uint; // provided globally
 using ::uint8;
 using ::uint16;
 using ::uint32;
@@ -40,7 +40,7 @@
 using ::int64;
 using ::unichar;
 #else   /* !_BIRNET_SOURCE_EXTENSIONS */
-typedef BirnetUInt		uint;
+// typedef BirnetUInt uint; // provided globally
 typedef BirnetUInt8		uint8;
 typedef BirnetUInt16		uint16;
 typedef BirnetUInt32		uint32;

Modified: trunk/birnet/tests/signal.cc
===================================================================
--- trunk/birnet/tests/signal.cc	2006-08-24 19:30:59 UTC (rev 3867)
+++ trunk/birnet/tests/signal.cc	2006-08-24 20:29:00 UTC (rev 3868)
@@ -21,7 +21,6 @@
 
 namespace {
 using namespace Birnet;
-using Birnet::uint;
 
 struct ExtraType {
   virtual const char* message() { return "ExtraType::message()"; }