From: young <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 5 May 2014 19:34:54 +0000 (+0000)
Subject: Another merge from mainline to petscscalar_complex...
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c84390b2a088785f128cbdb72c496affefb34f92;p=dealii-svn.git

Another merge from mainline to petscscalar_complex...

git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32889 0785d39b-7218-0410-832d-ea1e28bc413d
---

c84390b2a088785f128cbdb72c496affefb34f92
diff --cc tests/tests.h
index 968bf1de9c,ef37ca2046..75e21f8ab6
--- a/tests/tests.h
+++ b/tests/tests.h
@@@ -142,14 -211,10 +211,10 @@@ namespac
  #endif
  
  
- // implicitly use the deal.II namespace everywhere, without us having to say
- // so in each and every testcase
- using namespace dealii;
- 
- // Function for initialize deallog. Normally, it should be called at
+ // Function to initialize deallog. Normally, it should be called at
  // the beginning of main() like
  //
 -// initlog();
 +// initlog(__FILE__);
  //
  // This will open the correct output file, divert log output there and
  // switch off screen output. If screen output is desired, provide the
@@@ -157,11 -222,10 +222,10 @@@
  std::string deallogname;
  std::ofstream deallogfile;
  
- inline
  void
 -initlog(bool console=false)
 +initlog(const char *filename, bool console=false)
  {
 -  deallogname = "output";
 +  deallogname = JobIdentifier::base_name(filename) + std::string("/output");
    deallogfile.open(deallogname.c_str());
    deallog.attach(deallogfile);
    if (!console)