SF.net SVN: geany:[3276] trunk

[ntrel at users.sourceforge.net]

Revision: 3276
          http://geany.svn.sourceforge.net/geany/?rev=3276&view=rev
Author:   ntrel
Date:     2008-11-24 13:35:10 +0000 (Mon, 24 Nov 2008)

Log Message:
-----------
Fix nested namespaces not having parent namespace scope (fixes
#2141317).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tagmanager/c.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-24 11:04:12 UTC (rev 3275)
+++ trunk/ChangeLog	2008-11-24 13:35:10 UTC (rev 3276)
@@ -1,3 +1,10 @@
+2008-11-24  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * tagmanager/c.c:
+   Fix nested namespaces not having parent namespace scope (fixes
+   #2141317).
+
+
 2008-11-23  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/symbols.c:

Modified: trunk/tagmanager/c.c
===================================================================
--- trunk/tagmanager/c.c	2008-11-24 11:04:12 UTC (rev 3275)
+++ trunk/tagmanager/c.c	2008-11-24 13:35:10 UTC (rev 3276)
@@ -1257,7 +1257,8 @@
 
 		for (s = st->parent  ;  s != NULL  ;  s = s->parent)
 		{
-			if (isContextualStatement (s))
+			if (isContextualStatement (s) ||
+				s->declaration == DECL_NAMESPACE)
 			{
 				vStringCopy (temp, string);
 				vStringClear (string);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.