Merging develop into master

Nightly Bot · cwsmith · commit d2fbb2603324 · 2018-07-27T00:22:35.000-04:00
diff --git a/phasta/phiotimer.cc b/phasta/phiotimer.cc
@@ -44,7 +44,7 @@ static size_t phastaio_getCyclesPerMicroSec() {
   cycles = t1 - t0;
   cpus = ((double)cycles)/(usec);
   if(!PCU_Comm_Self())
-    cerr << "cycles " << cycles << " us " << usec
+    std::cerr << "cycles " << cycles << " us " << usec
          << " cycles per micro second " << cpus << "\n";
   return cpus;
 }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ static size_t phastaio_getCyclesPerMicroSec() {`
`44`	`44`	`cycles = t1 - t0;`
`45`	`45`	`cpus = ((double)cycles)/(usec);`
`46`	`46`	`if(!PCU_Comm_Self())`
`47`		`- cerr << "cycles " << cycles << " us " << usec`
	`47`	`+ std::cerr << "cycles " << cycles << " us " << usec`
`48`	`48`	`<< " cycles per micro second " << cpus << "\n";`
`49`	`49`	`return cpus;`
`50`	`50`	`}`