Further wxUniv fixes

[wxWidgets.git] / include / wx / longlong.h

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index e5f82a5f7a795d052d61c87c365771a84f8b0c29..621abc3e3dd2f1c8799c7637732abe2fe903a0fe 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -88,7 +88,12 @@
     #endif
 
     class WXDLLEXPORT wxLongLongWx;
     #endif
 
     class WXDLLEXPORT wxLongLongWx;

+#if defined(__VISUALC__) && !defined(__WIN32__)
+    #define wxLongLong wxLongLongWx
+#else

     typedef wxLongLongWx wxLongLong;
     typedef wxLongLongWx wxLongLong;

+#endif
+

 #else
     // if nothing is defined, use native implementation by default, of course
     #ifndef wxUSE_LONGLONG_NATIVE
 #else
     // if nothing is defined, use native implementation by default, of course
     #ifndef wxUSE_LONGLONG_NATIVE


@@ -303,7 +308,7 @@ public:
 
 #if wxUSE_STD_IOSTREAM
         // input/output
 
 #if wxUSE_STD_IOSTREAM
         // input/output

-    friend ostream& operator<<(ostream&, const wxLongLongNative&);
+    friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&);

 #endif
 
 private:
 #endif
 
 private:


@@ -485,7 +490,7 @@ public:
 
     // input/output
 #if wxUSE_STD_IOSTREAM
 
     // input/output
 #if wxUSE_STD_IOSTREAM

-    friend ostream& operator<<(ostream&, const wxLongLongWx&);
+    friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&);

 #endif // wxUSE_STD_IOSTREAM
 
     void *asArray() const;
 #endif // wxUSE_STD_IOSTREAM
 
     void *asArray() const;


@@ -512,14 +517,14 @@ private:
 // binary operators
 // ----------------------------------------------------------------------------
 
 // binary operators
 // ----------------------------------------------------------------------------
 

-inline bool WXDLLEXPORT operator<(long l, const wxLongLong& ll) { return ll > l; }
-inline bool WXDLLEXPORT operator>(long l, const wxLongLong& ll) { return ll > l; }
-inline bool WXDLLEXPORT operator<=(long l, const wxLongLong& ll) { return ll > l; }
-inline bool WXDLLEXPORT operator>=(long l, const wxLongLong& ll) { return ll > l; }
-inline bool WXDLLEXPORT operator==(long l, const wxLongLong& ll) { return ll > l; }
-inline bool WXDLLEXPORT operator!=(long l, const wxLongLong& ll) { return ll > l; }
+inline bool operator<(long l, const wxLongLong& ll) { return ll > l; }
+inline bool operator>(long l, const wxLongLong& ll) { return ll > l; }
+inline bool operator<=(long l, const wxLongLong& ll) { return ll > l; }
+inline bool operator>=(long l, const wxLongLong& ll) { return ll > l; }
+inline bool operator==(long l, const wxLongLong& ll) { return ll > l; }
+inline bool operator!=(long l, const wxLongLong& ll) { return ll > l; }

 
 

-inline wxLongLong WXDLLEXPORT operator+(long l, const wxLongLong& ll) { return ll + l; }
-inline wxLongLong WXDLLEXPORT operator-(long l, const wxLongLong& ll) { return ll - l; }
+inline wxLongLong operator+(long l, const wxLongLong& ll) { return ll + l; }
+inline wxLongLong operator-(long l, const wxLongLong& ll) { return ll - l; }

 
 #endif // _WX_LONGLONG_H
 
 #endif // _WX_LONGLONG_H