Fix for bug in GCC

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21521 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 9 deletions

diff --git a/o3d/import/cross/camera_info_test.cc b/o3d/import/cross/camera_info_test.cc
index b21cf4a..ce1b105 100644
--- a/o3d/import/cross/camera_info_test.cc
+++ b/o3d/import/cross/camera_info_test.cc
@@ -46,14 +46,13 @@ class TestCameraInfo : public CameraInfo {
  public:

   typedef SmartPointer<TestCameraInfo> Ref;

 

+  static ObjectBase::Ref Create(ServiceLocator* service_locator);

+

  private:

   explicit TestCameraInfo(ServiceLocator* service_locator)

       : CameraInfo(service_locator) {

   }

 

-  friend class IClassManager;

-  static ObjectBase::Ref Create(ServiceLocator* service_locator);

-

   O3D_OBJECT_BASE_DECL_CLASS(TestCameraInfo, CameraInfo);

   DISALLOW_COPY_AND_ASSIGN(TestCameraInfo);

 };

diff --git a/o3d/import/cross/json_object.cc b/o3d/import/cross/json_object.cc
index bf3f79e..a681a3a 100644
--- a/o3d/import/cross/json_object.cc
+++ b/o3d/import/cross/json_object.cc
@@ -31,7 +31,6 @@
 

 // This file defines the JSON Object class.

 

-#include "core/cross/precompile.h"

 #include "import/cross/json_object.h"

 

 namespace o3d {

diff --git a/o3d/import/cross/json_object_test.cc b/o3d/import/cross/json_object_test.cc
index ff745a2..8935f8b 100644
--- a/o3d/import/cross/json_object_test.cc
+++ b/o3d/import/cross/json_object_test.cc
@@ -211,6 +211,10 @@ class TestJSONObject : public JSONObject {
     optional_string_value_->set_value(value);

   }

 

+  static ObjectBase::Ref Create(ServiceLocator* service_locator) {

+    return ObjectBase::Ref(new TestJSONObject(service_locator));

+  }

+

  private:

   explicit TestJSONObject(ServiceLocator* service_locator)

       : JSONObject(service_locator) {

@@ -234,11 +238,6 @@ class TestJSONObject : public JSONObject {
     RegisterJSONValue(kOptionalStringValueName, &optional_string_value_);

   }

 

-  friend class IClassManager;

-  static ObjectBase::Ref Create(ServiceLocator* service_locator) {

-    return ObjectBase::Ref(new TestJSONObject(service_locator));

-  }

-

   // One of each type of JSONValue

   JSONFloat::Ref float_value_;

   JSONFloat2::Ref float2_value_;