| author | Michael Krelin <hacker@klever.net> | 2007-06-28 12:24:23 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2007-06-28 12:24:23 (UTC) |
| commit | 3779aa290c30ee80976b63db0b8d17ab73f64847 (patch) (side-by-side diff) | |
| tree | 5ed2262631bd8119c7d03710704812c2ef385eb7 | |
| parent | f58a286ee7b26101e97e5b69b6c026f4c33a037d (diff) | |
| download | sitecing-showcase/master.zip sitecing-showcase/master.tar.gz sitecing-showcase/master.tar.bz2 | |
imported amd64bit compile fixespublic/showcase/mastershowcase/master
| -rw-r--r-- | htdocs/handlers/exception_dev | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/htdocs/handlers/exception_dev b/htdocs/handlers/exception_dev index d62f462..49b7f45 100644 --- a/htdocs/handlers/exception_dev +++ b/htdocs/handlers/exception_dev @@ -21,13 +21,13 @@ %%var int line_number = -1; %%var const exception* exception_caught; <%code> __SCIF->headers.clear(); __SCIF->out->seekp(0); int magic = _magic; - va_list va = _args; + va_list va; va_copy(va,_args); switch(magic) { case sitecing::__magic_compile_error: message = va_arg(va,const char*); root_source = va_arg(va,const char*); root_intermediate = va_arg(va,const char*); root_so = va_arg(va,const char*); @@ -323,12 +323,13 @@ try{ return sitecing::strip_prefix(np,root_source); }catch(sitecing::utility_no_prefix& e){ } try{ return sitecing::strip_prefix(np,root_intermediate); }catch(sitecing::utility_no_prefix& e){ } + return np; </%codemethod> <%codemethod string remove_roots(const string& str) %> string rv = str; string::size_type rp; string::size_type rl = root_source.length(); while((rp=rv.find(root_source))!=string::npos) { |