Revert "Isolate JKRHeap operator overloads" (#39)

src/d/d_demo.cpp

@@ -48,7 +48,7 @@ jstudio_tCreateObject_message::create(JStudio::TObject** ppObject,
     switch (type) {
     case 'JMSG': 
         {
-            jstudio_tAdaptor_message* adaptor = JKR_NEW jstudio_tAdaptor_message();
+            jstudio_tAdaptor_message* adaptor = new jstudio_tAdaptor_message();
             if (adaptor == NULL) {
                 return false;
             }
@@ -676,7 +676,7 @@ JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) {
         return NULL;
     }
 
-    demoActor = JKR_NEW dDemo_actor_c();
+    demoActor = new dDemo_actor_c();
     if (demoActor == NULL) {
         // "Failed to get Demo Actor!!\n"
         OS_REPORT("デモアクター確保失敗！！\n");
@@ -709,7 +709,7 @@ dDemo_camera_c* dDemo_object_c::createCamera() {
         return mpCamera;
     }
 
-    mpCamera = JKR_NEW dDemo_camera_c();
+    mpCamera = new dDemo_camera_c();
     return mpCamera;
 }
 
@@ -720,7 +720,7 @@ dDemo_camera_c* dDemo_object_c::createEditorCamera() {
         return mpEditorCamera;
     }
 
-    mpEditorCamera = JKR_NEW dDemo_camera_c();
+    mpEditorCamera = new dDemo_camera_c();
     return mpEditorCamera;
 }
 #endif
@@ -740,7 +740,7 @@ JStage::TObject* dDemo_object_c::createAmbient() {
         return mpAmbient;
     }
 
-    mpAmbient = JKR_NEW dDemo_ambient_c();
+    mpAmbient = new dDemo_ambient_c();
     return mpAmbient;
 }
 
@@ -751,7 +751,7 @@ JStage::TObject* dDemo_object_c::appendLight() {
         return NULL;
     }
 
-    dDemo_light_c* demoLight = JKR_NEW dDemo_light_c();
+    dDemo_light_c* demoLight = new dDemo_light_c();
     if (demoLight == NULL) {
         // "Failed to get Demo Light!!\n"
         OS_REPORT("デモライト確保失敗！！\n");
@@ -770,31 +770,31 @@ JStage::TObject* dDemo_object_c::createFog() {
         return mpFog;
     }
 
-    mpFog = JKR_NEW dDemo_fog_c();
+    mpFog = new dDemo_fog_c();
     return mpFog;
 }
 
 void dDemo_object_c::remove() {
     while (mActorNum != 0) {
-        JKR_DELETE(mpActors[--mActorNum]);
+        delete mpActors[--mActorNum];
     }
 
     if (mpCamera != NULL) {
-        JKR_DELETE(mpCamera);
+        delete mpCamera;
         mpCamera = NULL;
     }
 
     if (mpAmbient != NULL) {
-        JKR_DELETE(mpAmbient);
+        delete mpAmbient;
         mpAmbient = NULL;
     }
 
     while (mLightNum != 0) {
-        JKR_DELETE(mpLights[--mLightNum]);
+        delete mpLights[--mLightNum];
     }
 
     if (mpFog != NULL) {
-        JKR_DELETE(mpFog);
+        delete mpFog;
         mpFog = NULL;
     }
 }
@@ -802,7 +802,7 @@ void dDemo_object_c::remove() {
 #if DEBUG
 void dDemo_object_c::removeEditorCamera() {
     if (mpEditorCamera) {
-        JKR_DELETE(mpEditorCamera);
+        delete mpEditorCamera;
         mpEditorCamera = NULL;
     }
 }
@@ -877,33 +877,33 @@ int dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNam
 }
 
 void dDemo_c::create() {
-    m_system = JKR_NEW dDemo_system_c();
+    m_system = new dDemo_system_c();
     JUT_ASSERT(1774, m_system != NULL);
 
-    m_control = JKR_NEW JStudio::TControl();
+    m_control = new JStudio::TControl();
     JUT_ASSERT(1776, m_control != NULL);
 
-    m_mesgControl = JKR_NEW jmessage_tControl();
+    m_mesgControl = new jmessage_tControl();
     JUT_ASSERT(1778, m_mesgControl != NULL);
 
-    m_stage = JKR_NEW JStudio_JStage::TCreateObject(m_system);
+    m_stage = new JStudio_JStage::TCreateObject(m_system);
     JUT_ASSERT(1781, m_stage != NULL);
 
-    JStudio_JAudio2::TCreateObject* p_audio = JKR_NEW JStudio_JAudio2::TCreateObject(Z2GetSoundStarter(), m_system);
+    JStudio_JAudio2::TCreateObject* p_audio = new JStudio_JAudio2::TCreateObject(Z2GetSoundStarter(), m_system);
     m_audio = p_audio;
     JUT_ASSERT(1787, m_audio != NULL);
     p_audio->setPermit_onExit_notEnd(true);
 
-    m_particle = JKR_NEW dDemo_particle_c(dPa_control_c::getEmitterManager(), m_system);
+    m_particle = new dDemo_particle_c(dPa_control_c::getEmitterManager(), m_system);
     JUT_ASSERT(1794, m_particle != NULL);
 
-    m_message = JKR_NEW jstudio_tCreateObject_message();
+    m_message = new jstudio_tCreateObject_message();
     JUT_ASSERT(1797, m_message != NULL);
 
-    m_factory = JKR_NEW JStudio::TFactory();
+    m_factory = new JStudio::TFactory();
     JUT_ASSERT(1800, m_factory != NULL);
 
-    m_object = JKR_NEW dDemo_object_c();
+    m_object = new dDemo_object_c();
     JUT_ASSERT(1802, m_object != NULL);
 
     m_control->setSecondPerFrame(1.0f / 30.0f);
@@ -923,47 +923,47 @@ void dDemo_c::remove() {
     end();
 
     if (m_object != NULL) {
-        JKR_DELETE(m_object);
+        delete m_object;
         m_object = NULL;
     }
 
     if (m_factory != NULL) {
-        JKR_DELETE(m_factory);
+        delete m_factory;
         m_factory = NULL;
     }
 
     if (m_message != NULL) {
-        JKR_DELETE(m_message);
+        delete m_message;
         m_message = NULL;
     }
 
     if (m_particle != NULL) {
-        JKR_DELETE(m_particle);
+        delete m_particle;
         m_particle = NULL;
     }
 
     if (m_audio != NULL) {
-        JKR_DELETE(m_audio);
+        delete m_audio;
         m_audio = NULL;
     }
 
     if (m_stage != NULL) {
-        JKR_DELETE(m_stage);
+        delete m_stage;
         m_stage = NULL;
     }
 
     if (m_mesgControl != NULL) {
-        JKR_DELETE(m_mesgControl);
+        delete m_mesgControl;
         m_mesgControl = NULL;
     }
 
     if (m_control != NULL) {
-        JKR_DELETE(m_control);
+        delete m_control;
         m_control = NULL;
     }
 
     if (m_system != NULL) {
-        JKR_DELETE(m_system);
+        delete m_system;
         m_system = NULL;
     }
 }