summaryrefslogtreecommitdiffstats
path: root/o3d/import/cross/json_object_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'o3d/import/cross/json_object_test.cc')
-rw-r--r--o3d/import/cross/json_object_test.cc9
1 files changed, 4 insertions, 5 deletions
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_;