Some cleanup after the string conversion

[[Imported from SVN: r2044]]

common/dynamictype.hh

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#ifndef __DUNE_DYNAMICTYPE_HH__
-#define __DUNE_DYNAMICTYPE_HH__
+#ifndef DUNE_DYNAMICTYPE_HH
+#define DUNE_DYNAMICTYPE_HH
 
-#include <assert.h>
+#include <cassert>
+//#include <iostream>
 
 namespace Dune {
 
@@ -37,6 +38,7 @@ namespace Dune {
     //! return identifier
     IdentifierType getIdentifier() const
     {
+      //std::cout << "Id: " << identifier_ << "(" << undefined << ")" << std::endl;
       assert(identifier_ != undefined);
       return identifier_;
     }

common/fvector.hh

@@ -472,13 +472,12 @@ namespace Dune {
 
     //===== assignment from scalar
     //! Assignment operator for scalar
-    FieldVector& operator= (const K& k)
+    const FieldVector& operator= (const K& k)
     {
       fvmeta_assignscalar<n-1>::assignscalar(*this,k);
       return *this;
     }
 
-
     //===== access to components
 
     //! random access

common/misc.hh

@@ -40,7 +40,10 @@ namespace Dune {
   //
   //********************************************************************
 
-  inline std::basic_string<char> genFilename(std::basic_string <char> path, std::basic_string <char> fn, int ntime, int precision = 6)
+  inline std::string genFilename(const std::string& path,
+                                 const std::string& fn,
+                                 int ntime,
+                                 int precision = 6)
   {
     std::ostringstream name;
 
@@ -72,7 +75,7 @@ namespace Dune {
     name << cp;
 
     // here implicitly a string is generated
-    return name.str().c_str();
+    return name.str();
   }
 
   /** @} */