[mlpack-svn] r16392 - mlpack/trunk/src/mlpack/core/util

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: Mon Mar 31 09:51:10 2014
New Revision: 16392

Log:
Whatever bug used to be here before isn't here now.


Modified:
   mlpack/trunk/src/mlpack/core/util/nulloutstream.hpp

Modified: mlpack/trunk/src/mlpack/core/util/nulloutstream.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/util/nulloutstream.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/util/nulloutstream.hpp	Mon Mar 31 09:51:10 2014
@@ -32,54 +32,45 @@
    */
   NullOutStream(const NullOutStream& /* other */) { }
 
-  /*
-   We use (void) paramName in order to avoid the warning generated by
-   -Wextra. For some currently unknown reason, simply deleting the
-   parameter name (aka, outperator<<(bool) {...}) causes a compilation
-   error (with -Werror off) for only this class.
-   */
-
   //! Does nothing.
-  NullOutStream& operator<<(bool val) { (void) val; return *this; }
+  NullOutStream& operator<<(bool) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(short val) { (void) val; return *this; }
+  NullOutStream& operator<<(short) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(unsigned short val) { (void) val; return *this; }
+  NullOutStream& operator<<(unsigned short) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(int val) { (void) val; return *this; }
+  NullOutStream& operator<<(int) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(unsigned int val) { (void) val; return *this; }
+  NullOutStream& operator<<(unsigned int) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(long val) { (void) val; return *this; }
+  NullOutStream& operator<<(long) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(unsigned long val) { (void) val; return *this; }
+  NullOutStream& operator<<(unsigned long) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(float val) { (void) val; return *this; }
+  NullOutStream& operator<<(float) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(double val) { (void) val; return *this; }
+  NullOutStream& operator<<(double) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(long double val) { (void) val; return *this; }
+  NullOutStream& operator<<(long double) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(void* val) { (void) val; return *this; }
+  NullOutStream& operator<<(void*) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(const char* str) { (void) str; return *this; }
+  NullOutStream& operator<<(const char*) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(std::string& str) { (void) str; return *this; }
+  NullOutStream& operator<<(std::string&) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(std::streambuf* sb) { (void) sb; return *this; }
+  NullOutStream& operator<<(std::streambuf*) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(std::ostream& (*pf) (std::ostream&))
-  { (void) pf; return *this; }
+  NullOutStream& operator<<(std::ostream& (*) (std::ostream&)) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(std::ios& (*pf) (std::ios&)) { (void) pf; return *this; }
+  NullOutStream& operator<<(std::ios& (*) (std::ios&)) { return *this; }
   //! Does nothing.
-  NullOutStream& operator<<(std::ios_base& (*pf) (std::ios_base&))
-  { (void) pf; return *this; }
+  NullOutStream& operator<<(std::ios_base& (*) (std::ios_base&))
+  { return *this; }
 
   //! Does nothing.
   template<typename T>
-  NullOutStream& operator<<(T& s)
-  { (void) s; return *this; }
+  NullOutStream& operator<<(T&) { return *this; }
 };
 
 } // namespace util