Merge remote-tracking branch 'origin/master' into topic/robin/dataseries

Conflicts:
	CMakeLists.txt
	cmake

src/logging/Manager.cc

@@ -476,14 +476,13 @@ bool Manager::TraverseRecord(Stream* stream, Filter* filter, RecordType* rt,
 		threading::Field* field = new threading::Field();
 		field->name = new_path;
 		field->type = t->Tag();
+
 		if ( field->type == TYPE_TABLE )
-			{
-				field->subtype = t->AsSetType()->Indices()->PureType()->Tag();
-			}
+			field->subtype = t->AsSetType()->Indices()->PureType()->Tag();
+
 		else if ( field->type == TYPE_VECTOR )
-			{
-				field->subtype = t->AsVectorType()->YieldType()->Tag();
-			}
+			field->subtype = t->AsVectorType()->YieldType()->Tag();
+
 		filter->fields[filter->num_fields - 1] = field;
 		}
 

src/logging/WriterBackend.h

@@ -15,10 +15,10 @@ namespace logging  {
  * Base class for writer implementation. When the logging::Manager creates a
  * new logging filter, it instantiates a WriterFrontend. That then in turn
  * creates a WriterBackend of the right type. The frontend then forwards
- * message over the backend as its methods are called.
+ * messages over the backend as its methods are called.
  *
  * All of this methods must be called only from the corresponding child
- * thread (the constructor is the one exception.)
+ * thread (the constructor and destructor are the exceptions.)
  */
 class WriterBackend : public threading::MsgThread
 {

src/logging/WriterFrontend.cc

@@ -278,9 +278,3 @@ void WriterFrontend::DeleteVals(Value** vals)
 
 	delete [] vals;
 	}
-
-
-
-
-
-

src/logging/WriterFrontend.h

@@ -16,7 +16,7 @@ class WriterBackend;
  * Manager instantiates one \a WriterFrontend for each open logging filter.
  * Each frontend in turns instantiates a WriterBackend-derived class
  * internally that's specific to the particular output format. That backend
- * spawns a new thread, and it receives messages from the frontend that
+ * runs in a new thread, and it receives messages from the frontend that
  * correspond to method called by the manager.
  *
  */