[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kjs
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2007-06-20 21:12:45
Message-ID: 1182373965.353171.17881.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 678193 by chehrlic:

some warnings-- 
remove a msvc hack - emulate Q_DISABLE_COPY

 M  +1 -1      function.h  
 M  +1 -1      identifier.cpp  
 M  +0 -13     value.cpp  
 M  +3 -0      value.h  


--- trunk/KDE/kdelibs/kjs/function.h #678192:678193
@@ -128,7 +128,7 @@
     }
 
     bool isLocalReadOnly(int propertyID) {
-      return _locals[propertyID].attr & ReadOnly;
+      return (_locals[propertyID].attr & ReadOnly) == ReadOnly;
     }
 
     virtual const ClassInfo *classInfo() const { return &info; }
--- trunk/KDE/kdelibs/kjs/identifier.cpp #678192:678193
@@ -29,7 +29,7 @@
 
 namespace WTF {
 
-    template<typename T> class DefaultHash;
+    template<typename T> struct DefaultHash;
     template<typename T> class StrHash;
 
     template<> struct StrHash<KJS::UString::Rep *> {
--- trunk/KDE/kdelibs/kjs/value.cpp #678192:678193
@@ -193,17 +193,4 @@
     return new NumberImp(d);
 }
 
-// Christian Ehrlicher: I really don't understand why those two members are referenced
-// in every obj-file in kjs and therefore needed
-JSValue::JSValue(const JSValue&o)
-{
-    *this = o;
-}
-
-JSValue& JSValue::operator=(const JSValue&o)
-{
-    *this = o;
-    return *this;
-}
-
 } // namespace KJS
--- trunk/KDE/kdelibs/kjs/value.h #678192:678193
@@ -109,9 +109,12 @@
     const JSCell *asCell() const;
     inline int32_t toInt32Inline(ExecState*, bool& ok) const;
 
+    // emulate Q_DISABLE_COPY to avoid msvc linker errors
+#if !defined(_MSC_VER) || !defined(MAKE_KJS_LIB)
     // Give a compile time error if we try to copy one of these.
     JSValue(const JSValue&);
     JSValue& operator=(const JSValue&);
+#endif
 };
 
 class KJS_EXPORT JSCell : public JSValue {
[prev in list] [next in list] [prev in thread] [next in thread]