[Mockpp-commits] mockpp/mockpp/compat Formatter.cpp,1.41,1.42 Formatter.h,1.32,1.33

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/compat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10742/mockpp/compat

Modified Files:
	Formatter.cpp Formatter.h 
Log Message:
fixed compilation problems on certain data types

Index: Formatter.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Formatter.h	24 Jul 2005 18:58:38 -0000	1.32
+++ Formatter.h	31 Jul 2005 14:14:08 -0000	1.33
@@ -86,7 +86,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, int repdata);
+mockpp::String & operator << (mockpp::String &formatter, const int &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -97,7 +97,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, bool repdata);
+mockpp::String & operator << (mockpp::String &formatter, const bool &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -108,7 +108,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, unsigned int repdata);
+mockpp::String & operator << (mockpp::String &formatter, const unsigned int &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -119,7 +119,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, unsigned long repdata);
+mockpp::String & operator << (mockpp::String &formatter, const unsigned long &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -130,7 +130,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, signed char repdata);
+mockpp::String & operator << (mockpp::String &formatter, const signed char &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -141,7 +141,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, unsigned char repdata);
+mockpp::String & operator << (mockpp::String &formatter, const unsigned char &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -152,7 +152,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, char repdata);
+mockpp::String & operator << (mockpp::String &formatter, const char &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -163,7 +163,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const char *repdata);
+mockpp::String & operator << (mockpp::String &formatter, const char * repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -174,7 +174,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, float repdata);
+mockpp::String & operator << (mockpp::String &formatter, const float &repdata);
 
 #ifdef MOCKPP_UNICODE
 
@@ -186,7 +186,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, wchar_t repdata);
+mockpp::String & operator << (mockpp::String &formatter, const wchar_t &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -197,7 +197,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const wchar_t *repdata);
+mockpp::String & operator << (mockpp::String &formatter, const wchar_t * repdata);
 
 #endif // MOCKPP_UNICODE
 
@@ -210,7 +210,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, long repdata);
+mockpp::String & operator << (mockpp::String &formatter, const long &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -259,7 +259,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, double repdata);
+mockpp::String & operator << (mockpp::String &formatter, const double &repdata);
 
 
 #ifdef MOCKPP_ENABLE_DEFAULT_FORMATTER
@@ -293,7 +293,7 @@
   * @return the resulting string
   */
 template <typename T>
-mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T *po)
+mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T * &po)
 {
   mockpp::String s =   MOCKPP_PCHAR("[")
                      + MOCKPP_GET_STRING(typeid(*po).name())

Index: Formatter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Formatter.cpp	23 Jul 2005 17:37:33 -0000	1.41
+++ Formatter.cpp	31 Jul 2005 14:14:08 -0000	1.42
@@ -215,7 +215,7 @@
 #else
 #if (defined (_MSC_VER) && (_MSC_VER <= 1300)) || (defined (__GNUC__) && (__GNUC__ < 3))
   if (!isalnum(x))
-#else  
+#else
   if (!std::isalnum(x))
 #endif
   {
@@ -237,35 +237,35 @@
 } // namespace mockpp
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, int repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const int &repdata )
 {
   formatter << mockpp::number( ( long ) repdata );
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, bool repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const bool &repdata )
 {
   formatter << mockpp::number( ( long ) repdata );
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, unsigned int repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned int &repdata )
 {
   formatter << mockpp::number( ( unsigned long ) repdata );
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, unsigned long repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned long &repdata )
 {
   formatter << mockpp::number( repdata );
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, signed char repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const signed char &repdata )
 {
   mockpp::String s;
   formatter << mockpp::charToReadable(repdata);
@@ -273,14 +273,14 @@
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, char repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const char &repdata )
 {
   formatter << mockpp::charToReadable(repdata);
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, unsigned char repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned char &repdata )
 {
   formatter << mockpp::charToReadable(repdata);
   return formatter;
@@ -294,7 +294,7 @@
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, float repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const float &repdata )
 {
   formatter << mockpp::number( repdata );
   return formatter;
@@ -303,14 +303,14 @@
 
 #ifdef MOCKPP_UNICODE
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, wchar_t repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const wchar_t &repdata )
 {
   formatter << mockpp::charToReadable(repdata);
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const wchar_t *repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const wchar_t * repdata )
 {
   formatter << mockpp::String(repdata);
   return formatter;
@@ -319,14 +319,14 @@
 #endif
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, long repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const long &repdata )
 {
   formatter << mockpp::number( repdata );
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, double repdata )
+mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const double &repdata )
 {
   formatter << mockpp::number( repdata );
   return formatter;