From: Harald Radi <phanto@php.net>
Date: Mon, 20 May 2002 15:38:19 +0000 (+0000)
Subject: this way it even compiles
X-Git-Tag: RELEASE_0_10~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02a13a4ec494101ce9219650fbdc63dbf885aa69;p=php

this way it even compiles
#blame me if i did something wrong, i didn't test it ;)
---

diff --git a/sapi/activescript/classfactory.cpp b/sapi/activescript/classfactory.cpp
index 3d4f256db6..7dd37424c7 100644
--- a/sapi/activescript/classfactory.cpp
+++ b/sapi/activescript/classfactory.cpp
@@ -41,32 +41,32 @@ volatile LONG TPHPClassFactory::object_count = 0;
 TPHPClassFactory::TPHPClassFactory()
 {
 	m_refcount = 1;
-	InterlockedIncrement(&factory_count);
+	InterlockedIncrement(const_cast<long*> (&factory_count));
 }
 
 TPHPClassFactory::~TPHPClassFactory()
 {
-	InterlockedDecrement(&factory_count);
+	InterlockedDecrement(const_cast<long*> (&factory_count));
 }
 
 void TPHPClassFactory::AddToObjectCount(void)
 {
-	InterlockedIncrement(&object_count);
+	InterlockedIncrement(const_cast<long*> (&object_count));
 }
 
 void TPHPClassFactory::RemoveFromObjectCount(void)
 {
-	InterlockedDecrement(&object_count);
+	InterlockedDecrement(const_cast<long*> (&object_count));
 }
 
 STDMETHODIMP_(DWORD) TPHPClassFactory::AddRef(void)
 {
-	return InterlockedIncrement(&m_refcount);
+	return InterlockedIncrement(const_cast<long*> (&m_refcount));
 }
 
 STDMETHODIMP_(DWORD) TPHPClassFactory::Release(void)
 {
-	DWORD ret = InterlockedDecrement(&m_refcount);
+	DWORD ret = InterlockedDecrement(const_cast<long*> (&m_refcount));
 	if (ret == 0)
 		delete this;
 	return ret;
diff --git a/sapi/activescript/scriptengine.cpp b/sapi/activescript/scriptengine.cpp
index b0dc40dcb5..8e1f92baaf 100644
--- a/sapi/activescript/scriptengine.cpp
+++ b/sapi/activescript/scriptengine.cpp
@@ -250,11 +250,11 @@ public:
 	}
 	
 	STDMETHODIMP_(DWORD) AddRef(void) {
-		return InterlockedIncrement(&m_refcount);
+		return InterlockedIncrement(const_cast<long*> (&m_refcount));
 	}
 	
 	STDMETHODIMP_(DWORD) Release(void) {
-		DWORD ret = InterlockedDecrement(&m_refcount);
+		DWORD ret = InterlockedDecrement(const_cast<long*> (&m_refcount));
 		trace("%08x: IDispatchImpl: release ref count is now %d\n", this, ret);
 		if (ret == 0)
 			delete this;
@@ -1286,12 +1286,12 @@ trace("Add %s to global namespace\n", name);
 
 STDMETHODIMP_(DWORD) TPHPScriptingEngine::AddRef(void)
 {
-	return InterlockedIncrement(&m_refcount);
+	return InterlockedIncrement(const_cast<long*> (&m_refcount));
 }
 
 STDMETHODIMP_(DWORD) TPHPScriptingEngine::Release(void)
 {
-	DWORD ret = InterlockedDecrement(&m_refcount);
+	DWORD ret = InterlockedDecrement(const_cast<long*> (&m_refcount));
 	if (ret == 0) {
 		trace("%08x: Release: zero refcount, destroy the engine!\n", this);
 		delete this;
@@ -1305,9 +1305,9 @@ STDMETHODIMP TPHPScriptingEngine::QueryInterface(REFIID iid, void **ppvObject)
 	
 	if (IsEqualGUID(IID_IActiveScript, iid)) {
 		*ppvObject = (IActiveScript*)this;
-	} else if (IsEqualGUID(IID_IActiveScriptParse32, iid)) {
-		*ppvObject = (IActiveScriptParse32*)this;
-	} else if (IsEqualGUID(IID_IActiveScriptParseProcedure32, iid)) {
+	} else if (IsEqualGUID(IID_IActiveScriptParse, iid)) {
+		*ppvObject = (IActiveScriptParse*)this;
+	} else if (IsEqualGUID(IID_IActiveScriptParseProcedure, iid)) {
 		*ppvObject = (IActiveScriptParseProcedure*)this;
 	} else if (IsEqualGUID(IID_IUnknown, iid)) {
 		*ppvObject = this;	
@@ -1717,11 +1717,11 @@ public:
 	}
 	
 	STDMETHODIMP_(DWORD) AddRef(void) {
-		return InterlockedIncrement(&m_refcount);
+		return InterlockedIncrement(const_cast<long*> (&m_refcount));
 	}
 	
 	STDMETHODIMP_(DWORD) Release(void) {
-		DWORD ret = InterlockedDecrement(&m_refcount);
+		DWORD ret = InterlockedDecrement(const_cast<long*> (&m_refcount));
 		trace("Release: errobj refcount=%d\n", ret);
 		if (ret == 0)
 			delete this;