Attempt to address some windows nightly build errors

erbad · Jun 12, 2008 · 93fbd6a · 93fbd6a
1 parent dfe03fe
commit 93fbd6a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/olla/src/Kernel.cpp b/olla/src/Kernel.cpp
@@ -58,7 +58,7 @@ Kernel& Kernel::operator=(const Kernel& copy) {
     return *this;
 }
 
-string Kernel::Kernel::getName() const {
+string Kernel::getName() const {
     return impl->getName();
 }
 

diff --git a/olla/src/Stream.cpp b/olla/src/Stream.cpp
@@ -59,7 +59,7 @@ Stream& Stream::operator=(const Stream& copy) {
     return *this;
 }
 
-string Stream::Stream::getName() const {
+string Stream::getName() const {
     return impl->getName();
 }
 

diff --git a/tests/TestFindExclusions.cpp b/tests/TestFindExclusions.cpp
@@ -172,6 +172,7 @@ class DummyKEKernel : public CalcKineticEnergyKernel {
     void initialize(const vector<double>& masses) {
     }
     double execute(const Stream& positions) {
+        return 0.0;
     }
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -172,6 +172,7 @@ class DummyKEKernel : public CalcKineticEnergyKernel { @@
         void initialize(const vector<double>& masses) {
         }
         double execute(const Stream& positions) {
+            return 0.0;
         }
     };
@@ Expand Down @@