[patch] dxr3player-0.10-gcc41.patch

dxr3player-0.10-gcc41.patch (text/plain), 5.72 KB, created by Samuli Suominen (RETIRED) on 2007-03-07 15:50:52 UTC

diff -ur dxr3player-0.10.orig/src/lib/dxr3/DXR3.cc dxr3player-0.10/src/lib/dxr3/DXR3.cc
--- dxr3player-0.10.orig/src/lib/dxr3/DXR3.cc	2004-08-24 18:00:50.000000000 +0300
+++ dxr3player-0.10/src/lib/dxr3/DXR3.cc	2007-03-07 16:37:08.000000000 +0200
@@ -112,6 +112,7 @@
 
     em8300_register_t regs;
     
+    regs.microcode_register = 1;
     regs.reg = commandRegister;
     regs.val = command;
     
@@ -119,7 +120,6 @@
               command, commandRegister);
 
     waitCommand(statusRegister, expectedStatus);
-
 }
 
 //------------------------------------------------------------------------------
diff -ur dxr3player-0.10.orig/src/lib/dxr3/Video.h dxr3player-0.10/src/lib/dxr3/Video.h
--- dxr3player-0.10.orig/src/lib/dxr3/Video.h	2004-08-07 12:19:36.000000000 +0300
+++ dxr3player-0.10/src/lib/dxr3/Video.h	2007-03-07 16:38:12.000000000 +0200
@@ -102,7 +102,7 @@
     /**
      * Get the video standard
      */
-    videoStandard_t Video::getStandard();
+    videoStandard_t getStandard();
 
     /**
      * Set the aspect ratio
Only in dxr3player-0.10/src/lib/dxr3: blah.patch
diff -ur dxr3player-0.10.orig/src/lib/output/StateTracker.h dxr3player-0.10/src/lib/output/StateTracker.h
--- dxr3player-0.10.orig/src/lib/output/StateTracker.h	2005-03-18 14:35:07.000000000 +0200
+++ dxr3player-0.10/src/lib/output/StateTracker.h	2007-03-07 17:05:02.000000000 +0200
@@ -258,13 +258,13 @@
      * Handle the given button operation.
      */
     OutputProcessor::processorChange_t
-    StateTracker::handleButton(input::InputListener::operation_t operation);
+    handleButton(input::InputListener::operation_t operation);
 
     /**
      * Handle the given menu operation.
      */
     OutputProcessor::processorChange_t
-    StateTracker::handleMenu(input::InputListener::operation_t operation);
+    handleMenu(input::InputListener::operation_t operation);
 
     /**
      * Update the user position.
Only in dxr3player-0.10/src/lib/output: StateTracker.h.orig
diff -ur dxr3player-0.10.orig/src/lib/util/DefaultAllocator.h dxr3player-0.10/src/lib/util/DefaultAllocator.h
--- dxr3player-0.10.orig/src/lib/util/DefaultAllocator.h	2004-03-15 15:10:00.000000000 +0200
+++ dxr3player-0.10/src/lib/util/DefaultAllocator.h	2007-03-07 17:00:41.000000000 +0200
@@ -39,6 +39,7 @@
     typedef const T* const_pointer;
     typedef T& reference;
     typedef const T& const_reference;
+    typedef T value_type;
 
     /**
      * The rebind structure.
@@ -64,6 +65,17 @@
      * Allocate space for the given number of objects.
      */
     T* allocate(size_t n);
+
+    /**
+     * Copy construct a value at the given position from the given
+     * other value.
+     */
+    void construct(T* p, const T& value);
+
+    /**
+     * Destroy the given value.
+     */
+    void destroy(T* t);
     
     /**
      * Deallocate space for the given number of objects.
@@ -110,6 +122,22 @@
 //------------------------------------------------------------------------------
 
 template <typename T>
+inline void DefaultAllocatorTemplate<T>::construct(T* p, const T& value)
+{
+    ::new(p) T(value);
+}
+
+//------------------------------------------------------------------------------
+
+template <typename T>
+inline void DefaultAllocatorTemplate<T>::destroy(T* t)
+{
+    t->~T();
+}
+
+//------------------------------------------------------------------------------
+
+template <typename T>
 inline void DefaultAllocatorTemplate<T>::deallocate(T* ptr, size_t /*n*/)
 {
     ::operator delete(reinterpret_cast<void*>(ptr));
diff -ur dxr3player-0.10.orig/src/lib/util/JoystickConfig.h dxr3player-0.10/src/lib/util/JoystickConfig.h
--- dxr3player-0.10.orig/src/lib/util/JoystickConfig.h	2004-05-31 10:23:09.000000000 +0300
+++ dxr3player-0.10/src/lib/util/JoystickConfig.h	2007-03-07 16:51:26.000000000 +0200
@@ -37,8 +37,8 @@
     /**
      * Vector of commands.
      */
-    typedef std::vector<const char*, DefaultAllocatorTemplate<const char*> > commands_t;
-
+/*    typedef std::vector<const char*, DefaultAllocatorTemplate<const char*> > commands_t; */
+    typedef std::vector<const char*, DefaultAllocator> commands_t;
     /**
      * Associate the given string with the given index in the given
      * command set.
diff -ur dxr3player-0.10.orig/src/lib/util/Log.cc dxr3player-0.10/src/lib/util/Log.cc
--- dxr3player-0.10.orig/src/lib/util/Log.cc	2003-10-23 12:22:37.000000000 +0300
+++ dxr3player-0.10/src/lib/util/Log.cc	2007-03-07 16:33:22.000000000 +0200
@@ -27,6 +27,16 @@
 #include <ctime>
 
 //------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+Log::Logger& Log::Logger::getInstance()
+{
+    static Logger logger;
+    return logger;
+}
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
 Log::Logger::Logger() :
     logFile((Config::get().logFileName==0) ? 0 : fopen(Config::get().logFileName, "wt")),
diff -ur dxr3player-0.10.orig/src/lib/util/Log.h dxr3player-0.10/src/lib/util/Log.h
--- dxr3player-0.10.orig/src/lib/util/Log.h	2003-10-23 12:22:37.000000000 +0300
+++ dxr3player-0.10/src/lib/util/Log.h	2007-03-07 16:34:12.000000000 +0200
@@ -169,15 +169,6 @@
 // Inline definitions
 //------------------------------------------------------------------------------
 
-inline Log::Logger& Log::Logger::getInstance()
-{
-    static Logger logger;
-    return logger;
-}
-
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-
 inline void Log::log(type_t type, const char* format, va_list& ap)
 {
     Logger::getInstance().log(type, format, ap);
Only in dxr3player-0.10/src/lib/util: Log.h.orig