From e97408f5eae5f61ee88867f8cbd28dbce1c231a5 Mon Sep 17 00:00:00 2001 From: Thai Pangsakulyanont Date: Sun, 17 Jul 2011 12:19:14 +0700 Subject: [PATCH] [timing] it now builds, but it crashes upon starting (EXC_BAD_ACCESS) --- Xcode/stepmania.xcodeproj/project.pbxproj | 6 +++--- src/JsonUtil.h | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index 0f026901f7..a2fac07ad9 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -2019,7 +2019,7 @@ AA28B47A058F2F5D0097C109 /* MemoryCardManager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = MemoryCardManager.cpp; path = ../src/MemoryCardManager.cpp; sourceTree = ""; }; AA28B47B058F2F5D0097C109 /* MemoryCardManager.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = MemoryCardManager.h; path = ../src/MemoryCardManager.h; sourceTree = ""; }; AA29CE570558741A00961A51 /* Info-StepMania.plist */ = {isa = PBXFileReference; explicitFileType = text.plist; path = "Info-StepMania.plist"; sourceTree = SOURCE_ROOT; }; - AA29CE580558741A00961A51 /* StepMania.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StepMania.app; sourceTree = BUILT_PRODUCTS_DIR; }; + AA29CE580558741A00961A51 /* StepMania-debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "StepMania-debug.app"; sourceTree = BUILT_PRODUCTS_DIR; }; AA2C9C9F0BAD6F54002441E9 /* CodeSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CodeSet.cpp; path = ../src/CodeSet.cpp; sourceTree = ""; }; AA2C9CA00BAD6F54002441E9 /* CodeSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CodeSet.h; path = ../src/CodeSet.h; sourceTree = ""; }; AA2CA89D0BB745BD002441E9 /* ScreenContinue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScreenContinue.cpp; path = ../src/ScreenContinue.cpp; sourceTree = ""; }; @@ -3232,7 +3232,7 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - AA29CE580558741A00961A51 /* StepMania.app */, + AA29CE580558741A00961A51 /* StepMania-debug.app */, AA40D52B09A08D660068C0D5 /* sm-ssc.app */, AAE7817E0AC7E37B00AEFC64 /* liblua-5.1-sm5.a */, AA7A2B940AE09B520054C5BA /* lua */, @@ -5736,7 +5736,7 @@ name = stepmania; productInstallPath = "$(HOME)/Applications"; productName = "SDL App"; - productReference = AA29CE580558741A00961A51 /* StepMania.app */; + productReference = AA29CE580558741A00961A51 /* StepMania-debug.app */; productType = "com.apple.product-type.application"; }; AA40D1B409A08D650068C0D5 /* stepmania-bare */ = { diff --git a/src/JsonUtil.h b/src/JsonUtil.h index f8e47c5104..22c33ae4ec 100644 --- a/src/JsonUtil.h +++ b/src/JsonUtil.h @@ -32,6 +32,15 @@ namespace JsonUtil fn(*v[i], root[i]); } + template + static void SerializeVectorPointers(const vector &v, void fn(const T &, Json::Value &), Json::Value &root) + { + root = Json::Value(Json::arrayValue); + root.resize(v.size()); + for(unsigned i=0; i static void SerializeVectorPointers(const vector &v, void fn(const T *, Json::Value &), Json::Value &root) {