[boost] Re: Metacomm regression is failing - cannot build bjam

From: David Abrahams (dave_at_[hidden])
Date: 2003-12-12 11:28:41

Misha Bergal <mbergal_at_[hidden]> writes:

> --------------- Relevant part log file ----------------------
>
> H:\boost6>call "C:\Program Files\Microsoft Visual Studio\VC98\Bin\vcvars32.bat" 
> Setting environment for using Microsoft Visual C++ tools.
> Setting environment for using Microsoft Visual C++ tools.

Now fixed in CVS via the following patches:

Index: tools/build/jam_src/native.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/native.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -w -u -r1.1 -r1.2
--- tools/build/jam_src/native.c	10 Dec 2003 07:57:21 -0000	1.1
+++ tools/build/jam_src/native.c	12 Dec 2003 16:26:23 -0000	1.2
@@ -14,6 +14,8 @@
     if (m->native_rules == 0) {
         m->native_rules = hashinit( sizeof( native_rule_t ), "native rules");
     }
+    
+    {
     native_rule_t n, *np = &n;
     n.name = rule;
     if (args)
@@ -27,5 +29,6 @@
     }
     n.procedure = parse_make( f, P0, P0, P0, C0, C0, 0 );        
     hashenter(m->native_rules, (HASHDATA**)&np);
+    }
 }
 

Index: tools/build/jam_src/modules/regex.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/modules/regex.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -w -u -r1.1 -r1.2
--- tools/build/jam_src/modules/regex.c	10 Dec 2003 11:29:09 -0000	1.1
+++ tools/build/jam_src/modules/regex.c	12 Dec 2003 16:26:23 -0000	1.2
@@ -32,6 +32,7 @@
 
 
     /* Result is cached and intentionally never freed */
+    {
     regexp *re = regex_compile( pattern->string );
 
     for(; l; l = l->next)
@@ -47,6 +48,7 @@
         }
     }
     string_free( buf );
+    }
 
     return result;
 }

-- 
Dave Abrahams
Boost Consulting
www.boost-consulting.com