This fixes a number of things that are warnings in the Mac compiler....

import/cross/collada_conditioner.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 35 matching lines @@
 #include "utils/cross/temporary_file.h"
 
 namespace o3d {
 namespace {
 FUDaeTextureFilterFunction::FilterFunction LookupFilterFunction(
     const char* name) {
   struct {
     const char* name;
     FUDaeTextureFilterFunction::FilterFunction func;
   } functions[] = {
-    "None", FUDaeTextureFilterFunction::NONE,
-    "Linear", FUDaeTextureFilterFunction::LINEAR,
-    "Point", FUDaeTextureFilterFunction::NEAREST,  // DX
-    "Nearest", FUDaeTextureFilterFunction::NEAREST,  // GL
-    "LinearMipmapLinear", FUDaeTextureFilterFunction::LINEAR_MIPMAP_LINEAR,
-    "LinearMipmapNearest", FUDaeTextureFilterFunction::LINEAR_MIPMAP_NEAREST,
-    "NearestMipmapNearest", FUDaeTextureFilterFunction::LINEAR_MIPMAP_NEAREST,
-    "NearestMipmapLinear", FUDaeTextureFilterFunction::NEAREST_MIPMAP_LINEAR,
+    {"None", FUDaeTextureFilterFunction::NONE},
+    {"Linear", FUDaeTextureFilterFunction::LINEAR},
+    {"Point", FUDaeTextureFilterFunction::NEAREST},  // DX
+    {"Nearest", FUDaeTextureFilterFunction::NEAREST},  // GL
+    {"LinearMipmapLinear", FUDaeTextureFilterFunction::LINEAR_MIPMAP_LINEAR},
+    {"LinearMipmapNearest", FUDaeTextureFilterFunction::LINEAR_MIPMAP_NEAREST},
+    {"NearestMipmapNearest", FUDaeTextureFilterFunction::LINEAR_MIPMAP_NEAREST},
+    {"NearestMipmapLinear", FUDaeTextureFilterFunction::NEAREST_MIPMAP_LINEAR},
     // TODO: Once FCollada supports the COLLADA v1.5 spec,
     // turn this on.
     // "Anisotropic", FUDaeTextureFilterFunction::ANISOTROPIC,
   };
-  for (int i = 0; i < sizeof(functions) / sizeof(functions[0]); ++i) {
+  for (size_t i = 0; i < sizeof(functions) / sizeof(functions[0]); ++i) {
     if (!base::strcasecmp(functions[i].name, name)) {
       return functions[i].func;
     }
   }
   return FUDaeTextureFilterFunction::UNKNOWN;
 }
 
 #undef CLAMP
 
 FUDaeTextureWrapMode::WrapMode LookupWrapMode(const char* name) {
   struct {
     const char* name;
     FUDaeTextureWrapMode::WrapMode mode;
   } modes[] = {
-    "None", FUDaeTextureWrapMode::NONE,
+    {"None", FUDaeTextureWrapMode::NONE},
     // DX-style names:
-    "Wrap", FUDaeTextureWrapMode::WRAP,
-    "Mirror", FUDaeTextureWrapMode::MIRROR,
-    "Clamp", FUDaeTextureWrapMode::CLAMP,
-    "Border", FUDaeTextureWrapMode::BORDER,
+    {"Wrap", FUDaeTextureWrapMode::WRAP},
+    {"Mirror", FUDaeTextureWrapMode::MIRROR},
+    {"Clamp", FUDaeTextureWrapMode::CLAMP},
+    {"Border", FUDaeTextureWrapMode::BORDER},
     // GL-style names:
-    "Repeat", FUDaeTextureWrapMode::WRAP,
-    "MirroredRepeat", FUDaeTextureWrapMode::MIRROR,
-    "ClampToEdge", FUDaeTextureWrapMode::CLAMP,
-    "ClampToBorder", FUDaeTextureWrapMode::BORDER,
+    {"Repeat", FUDaeTextureWrapMode::WRAP},
+    {"MirroredRepeat", FUDaeTextureWrapMode::MIRROR},
+    {"ClampToEdge", FUDaeTextureWrapMode::CLAMP},
+    {"ClampToBorder", FUDaeTextureWrapMode::BORDER},
   };
-  for (int i = 0; i < sizeof(modes) / sizeof(modes[0]); ++i) {
+  for (size_t i = 0; i < sizeof(modes) / sizeof(modes[0]); ++i) {
     if (!base::strcasecmp(modes[i].name, name)) {
       return modes[i].mode;
     }
   }
   return FUDaeTextureWrapMode::UNKNOWN;
 }
 
 FCDEffectParameter* FindParameter(FCDMaterial* material, const char* name) {
   for (size_t i = 0; i < material->GetEffectParameterCount(); ++i) {
     FCDEffectParameter* p = material->GetEffectParameter(i);
@@ skipping 463 matching lines @@
     }
     O3D_ERROR(service_locator_) << message;
   } else {
     cgDestroyEffect(effect);
     retval = true;
   }
   cgDestroyContext(context);
   return retval;
 }
 }  // namespace o3d