Browse Source

Fixed compile on OS X 10.8.

Lasse Öörni 13 years ago
parent
commit
c994be4c5b

+ 4 - 2
ThirdParty/Assimp/code/STEPFile.h

@@ -38,6 +38,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 ----------------------------------------------------------------------
 */
 */
 
 
+// Modified by Lasse Oorni for Urho3D
+
 #ifndef INCLUDED_AI_STEPFILE_H
 #ifndef INCLUDED_AI_STEPFILE_H
 #define INCLUDED_AI_STEPFILE_H
 #define INCLUDED_AI_STEPFILE_H
 
 
@@ -195,13 +197,13 @@ namespace STEP {
 			// conversion support.
 			// conversion support.
 			template <typename T>
 			template <typename T>
 			const T& ResolveSelect(const DB& db) const {
 			const T& ResolveSelect(const DB& db) const {
-				return Couple<T>(db).MustGetObject(To<EXPRESS::ENTITY>())->To<T>();
+				return Couple<T>(db).MustGetObject(To<EXPRESS::ENTITY>())->template To<T>();
 			}
 			}
 
 
 			template <typename T>
 			template <typename T>
 			const T* ResolveSelectPtr(const DB& db) const {
 			const T* ResolveSelectPtr(const DB& db) const {
 				const EXPRESS::ENTITY* e = ToPtr<EXPRESS::ENTITY>();
 				const EXPRESS::ENTITY* e = ToPtr<EXPRESS::ENTITY>();
-				return e?Couple<T>(db).MustGetObject(*e)->ToPtr<T>():(const T*)0;
+				return e?Couple<T>(db).MustGetObject(*e)->template ToPtr<T>():(const T*)0;
 			}
 			}
 
 
 		public:
 		public:

+ 3 - 6
ThirdParty/SDL/src/video/cocoa/SDL_cocoamodes.m

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
+
+// Modified by Lasse Oorni for Urho3D
+
 #include "SDL_config.h"
 #include "SDL_config.h"
 
 
 #if SDL_VIDEO_DRIVER_COCOA
 #if SDL_VIDEO_DRIVER_COCOA
@@ -102,9 +105,6 @@ CG_SetError(const char *prefix, CGDisplayErr result)
     case kCGErrorCannotComplete:
     case kCGErrorCannotComplete:
         error = "kCGErrorCannotComplete";
         error = "kCGErrorCannotComplete";
         break;
         break;
-    case kCGErrorNameTooLong:
-        error = "kCGErrorNameTooLong";
-        break;
     case kCGErrorNotImplemented:
     case kCGErrorNotImplemented:
         error = "kCGErrorNotImplemented";
         error = "kCGErrorNotImplemented";
         break;
         break;
@@ -114,9 +114,6 @@ CG_SetError(const char *prefix, CGDisplayErr result)
     case kCGErrorTypeCheck:
     case kCGErrorTypeCheck:
         error = "kCGErrorTypeCheck";
         error = "kCGErrorTypeCheck";
         break;
         break;
-    case kCGErrorNoCurrentPoint:
-        error = "kCGErrorNoCurrentPoint";
-        break;
     case kCGErrorInvalidOperation:
     case kCGErrorInvalidOperation:
         error = "kCGErrorInvalidOperation";
         error = "kCGErrorInvalidOperation";
         break;
         break;