[Saga-devel] saga-projects SVN commit 835: /applications/FAUST/

oweidner at cct.lsu.edu oweidner at cct.lsu.edu
Sat Jan 10 05:11:15 CST 2009


User: oweidner
Date: 2009/01/10 05:11 AM

Added:
 /applications/FAUST/
  CMakeLists.txt
 /applications/FAUST/agent/
  main.c
 /applications/FAUST/external/

Modified:
 /applications/FAUST/FAUST.xcodeproj/
  oweidner.mode1v3, oweidner.pbxuser, project.pbxproj
 /applications/FAUST/faust/faust/
  service.cpp

Log:
 - pending commits

File Changes:

Directory: /applications/FAUST/
===============================

File [added]: CMakeLists.txt
Delta lines: +235 -0
===================================================================
--- applications/FAUST/CMakeLists.txt	2009-01-03 13:15:28 UTC (rev 834)
+++ applications/FAUST/CMakeLists.txt	2009-01-10 11:10:56 UTC (rev 835)
@@ -0,0 +1,235 @@
+#  CMakeLists.txt
+#  FAUST - Framework for Adaptive Ubiquitous Scalable Tasks
+#
+#  Created by Ole Weidner <oweidner at cct.lsu.edu> on 01/16/09.
+#  Copyright 2009 Center for Computation & Technology. All rights reserved.
+#
+#  Distributed under the Boost Software License, Version 1.0. (See accompanying 
+#  LICENSE file or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+# We require at least CMake V2.6.2
+cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
+
+# allow more human readable "if then else" constructs
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
+
+# The name of our project is "hpx".  CMakeLists files in this project can
+# refer to the root source directory of the project as ${FAUST_SOURCE_DIR} and
+# to the root binary directory of the project as ${hpx_BINARY_DIR}.
+project(FAUST CXX C)
+
+# project version
+set(FAUST_MAJOR_VERSION 0)
+set(FAUST_MINOR_VERSION 1)
+set(FAUST_PATCH_LEVEL   0)
+set(FAUST_VERSION "${FAUST_MAJOR_VERSION}.${FAUST_MINOR_VERSION}.${FAUST_PATCH_LEVEL}")
+set(FAUST_SOVERSION ${FAUST_MAJOR_VERSION})
+
+
+# include additional macro definitions
+#include(HpxUtils)
+
+# set default cmake build type to RelWithDebInfo (None Debug Release RelWithDebInfo MinSizeRel)
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "RelWithDebInfo")
+endif()
+
+# We need to use Boost, namely the following Boost libraries
+set(Boost_FIND_VERSION_EXACT ON)
+set(Boost_FIND_VERSION_MAJOR 1)
+set(Boost_FIND_VERSION_MINOR 35)
+set(Boost_FIND_VERSION_PATCH 0)
+
+set(Boost_COMPONENTS_NEEDED
+    date_time
+    filesystem
+    graph
+    program_options
+    regex
+    serialization
+    system
+    signals
+    thread)
+set(Boost_USE_STATIC_LIBS OFF)
+
+find_package(Boost 1.35.0 COMPONENTS ${Boost_COMPONENTS_NEEDED})
+
+if(Boost_FOUND)
+    message(STATUS "Boost version found: " 
+        ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}
+        " (${Boost_INCLUDE_DIR})")
+else()
+    message(FATAL "Boost installation not found. Please specify the Boost"
+        "installation directory using -DBOOST_ROOT=...")
+endif()
+
+include_directories(${Boost_INCLUDE_DIR})
+link_directories(${Boost_LIBRARY_DIR})
+
+# We need to include several hpx directories for header files
+include_directories(${FAUST_SOURCE_DIR})
+#include_directories(${FAUST_SOURCE_DIR}/external/cache)
+
+# initialize installation directory (can be changed via ccmake or 
+# 'cmake -DCMAKE_PREFIX=...')
+if(UNIX)
+    SET(CMAKE_PREFIX "/usr/lib" 
+        CACHE PATH "Prefix prepended to install directories")
+endif()
+
+# force some variables that could be defined in the command line to be written 
+# to cache
+set(CMAKE_INSTALL_PREFIX "${CMAKE_PREFIX}" 
+    CACHE PATH "Where to install ${PROJECT_NAME}" 
+    FORCE)
+mark_as_advanced(CMAKE_INSTALL_PREFIX)
+set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" 
+    CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." 
+    FORCE)
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" 
+    CACHE PATH "Path to custom CMake Modules" 
+    FORCE)
+
+message(STATUS "HPX will be installed to: " ${CMAKE_INSTALL_PREFIX})
+
+# global library configuration
+add_definitions(-DHPX_PREFIX=\"${CMAKE_INSTALL_PREFIX}\")
+add_definitions(-DHPX_USE_LOCKFREE=1)
+add_definitions(-DHPX_USE_TBB=0)
+
+# the Boost serialization library needs to be linked as a shared library
+add_definitions(-DBOOST_SERIALIZATION_DYN_LINK)
+add_definitions(-DBOOST_ARCHIVE_DYN_LINK)
+
+# all other Boost libraries don't need to be loaded as shared libraries (but 
+# it's easier configuration wise to do so)
+add_definitions(-DBOOST_FILESYSTEM_DYN_LINK)
+add_definitions(-DBOOST_DATE_TIME_DYN_LINK)
+add_definitions(-DBOOST_PROGRAM_OPTIONS_DYN_LINK)
+add_definitions(-DBOOST_REGEX_DYN_LINK)
+add_definitions(-DBOOST_SYSTEM_DYN_LINK)
+add_definitions(-DBOOST_SIGNALS_DYN_LINK)
+add_definitions(-DBOOST_THREAD_DYN_DLL)
+
+# compiler/platform specific configuration
+if(MSVC)
+    add_definitions(-D_WINDOWS)
+    add_definitions(-DBOOST_USE_WINDOWS_H)
+    add_definitions(-D_WIN32_WINNT=0x0501)
+    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-D_SCL_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
+    # suppress certain warnings
+    add_definitions(-wd4251 -wd4231 -wd4275 -wd4660 -wd4094 -wd4267)
+    if(CMAKE_CL_64)
+        add_definitions(-DBOOST_COROUTINE_USE_FIBERS)
+    endif()
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCXX)
+    add_definitions(-DHPX_GCC_HAVE_VISIBILITY)
+    add_definitions(-DBOOST_COROUTINE_GCC_HAVE_VISIBILITY)
+
+    # check for availability of pthread_setaffinity_np()
+    include(CheckSymbolExists)
+    check_symbol_exists(pthread_setaffinity_np "pthread.h"
+        HAVE_PTHREAD_SETAFFINITY_NP)
+    if(HAVE_PTHREAD_SETAFFINITY_NP)
+        add_definition(-DHAVE_PTHREAD_SETAFFINITY_NP)
+    endif()
+endif()
+
+# additional preprocessor definitions
+add_definitions(-DBOOST_COROUTINE_USE_ATOMIC_COUNT)
+add_definitions(-DBOOST_COROUTINE_ARG_MAX=2)
+
+# Mac systems headers have some dependency on _XOPEN_SOURCE being defined
+# let's better be on the safe side...
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    add_definitions(-D_XOPEN_SOURCE=1)
+endif()
+
+# hpx_LIBRARIES lists all libraries a HPX module needs to be linked with by 
+# default, there may be more for individual modules, but this is the mandatory
+# set
+set(hpx_LIBRARIES hpx hpx_serialization)
+if(UNIX)
+    set(hpx_LIBRARIES ${hpx_LIBRARIES} dl)
+endif()
+
+# set variable helping in naming the target library names
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX "d")
+endif()
+if(UNIX)
+    set(component_LIBRARY_PREFIX "hpx_component_")
+endif()
+
+# Recurse into some subdirectories. This does not actually cause another cmake 
+# executable to run. The same process will walk through the project's entire 
+# directory structure.
+add_subdirectory(src)
+
+# Components are to build separately
+add_subdirectory(hpx/components)
+
+# executables depend on libraries above
+add_subdirectory(tests)
+add_subdirectory(examples)
+add_subdirectory(runtime)
+
+# installation instructions
+install(
+    DIRECTORY hpx/                    # install all hpx header files
+    DESTINATION include/hpx 
+    FILES_MATCHING PATTERN "*.hpp"
+    REGEX ".svn" EXCLUDE
+    REGEX "CMakeFiles" EXCLUDE)
+
+# install external dependencies
+install(
+    DIRECTORY external/cache/boost
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.hpp"
+    REGEX ".svn" EXCLUDE)
+install(
+    DIRECTORY external/coroutine/boost
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.hpp"
+    REGEX ".svn" EXCLUDE)
+install(
+    DIRECTORY external/endian/boost
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.hpp"
+    REGEX ".svn" EXCLUDE)
+if(${Boost_MINOR_VERSION} LESS 36)
+    install(
+        DIRECTORY external/exception/boost
+        DESTINATION include
+        FILES_MATCHING PATTERN "*.hpp"
+        REGEX ".svn" EXCLUDE)
+endif()
+install(
+    DIRECTORY external/lockfree/boost
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.hpp"
+    REGEX ".svn" EXCLUDE)
+install(
+    DIRECTORY external/logging/boost
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.hpp"
+    REGEX ".svn" EXCLUDE)
+install(
+    DIRECTORY external/plugin/boost
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.hpp"
+    REGEX ".svn" EXCLUDE)
+
+# export build settings
+include(CMakeExportBuildSettings)
+cmake_export_build_settings("${PROJECT_NAME}BuildSettings.cmake")
+
+# export library dependencies (keep this as the last line in the file)
+export_library_dependencies("${PROJECT_NAME}LibDeps.cmake")

Directory: /applications/FAUST/FAUST.xcodeproj/
===============================================

File [modified]: oweidner.mode1v3
Delta lines: +21 -51
===================================================================
--- applications/FAUST/FAUST.xcodeproj/oweidner.mode1v3	2009-01-03 13:15:28 UTC (rev 834)
+++ applications/FAUST/FAUST.xcodeproj/oweidner.mode1v3	2009-01-10 11:10:56 UTC (rev 835)
@@ -304,14 +304,14 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>18</integer>
+									<integer>30</integer>
 									<integer>16</integer>
 									<integer>1</integer>
 									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {318, 752}}</string>
+							<string>{{0, 0}, {318, 764}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -323,7 +323,7 @@
 					<key>GeometryConfiguration</key>
 					<dict>
 						<key>Frame</key>
-						<string>{{0, 0}, {335, 770}}</string>
+						<string>{{0, 0}, {335, 782}}</string>
 						<key>GroupTreeTableConfiguration</key>
 						<array>
 							<string>SCMStatusColumn</string>
@@ -332,7 +332,7 @@
 							<real>296</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>302 57 1089 811 0 0 1440 878 </string>
+						<string>26 43 1067 823 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -350,7 +350,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>description.hpp</string>
+								<string>service.hpp</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -358,11 +358,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>description.hpp</string>
+										<string>service.hpp</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>7B3C45D00F0F97E30022FF52</string>
+										<string>7BD3B2820F18B3B700F2D971</string>
 										<key>history</key>
 										<array>
 											<string>7B4E962F0EDB4EA9000F4094</string>
@@ -393,8 +393,6 @@
 											<string>7B1209CB0EFACA72008A61EA</string>
 											<string>7B1209CC0EFACA72008A61EA</string>
 											<string>7B1209CF0EFACA72008A61EA</string>
-											<string>7B3C454B0F0F93590022FF52</string>
-											<string>7B3C454C0F0F93590022FF52</string>
 											<string>7B3C454F0F0F93590022FF52</string>
 											<string>7B3C45A50F0F96750022FF52</string>
 											<string>7B3C45A60F0F96750022FF52</string>
@@ -402,7 +400,9 @@
 											<string>7B3C45A80F0F96750022FF52</string>
 											<string>7B3C45A90F0F96750022FF52</string>
 											<string>7B3C45C30F0F97A00022FF52</string>
-											<string>7B3C45C40F0F97A00022FF52</string>
+											<string>7B3C45D50F0F9E100022FF52</string>
+											<string>7BD3B27F0F18B3B700F2D971</string>
+											<string>7BD3B2800F18B3B700F2D971</string>
 										</array>
 										<key>prevStack</key>
 										<array>
@@ -440,36 +440,10 @@
 											<string>7B1209730EFAC505008A61EA</string>
 											<string>7B1209D40EFACA72008A61EA</string>
 											<string>7B120A090EFAE0B0008A61EA</string>
-											<string>7B3C45290F0F904C0022FF52</string>
-											<string>7B3C452A0F0F904C0022FF52</string>
-											<string>7B3C452B0F0F904C0022FF52</string>
-											<string>7B3C452D0F0F904C0022FF52</string>
 											<string>7B3C45430F0F92170022FF52</string>
 											<string>7B3C45510F0F93590022FF52</string>
-											<string>7B3C45520F0F93590022FF52</string>
-											<string>7B3C45530F0F93590022FF52</string>
-											<string>7B3C45540F0F93590022FF52</string>
-											<string>7B3C45550F0F93590022FF52</string>
-											<string>7B3C45560F0F93590022FF52</string>
 											<string>7B3C45570F0F93590022FF52</string>
-											<string>7B3C45580F0F93590022FF52</string>
-											<string>7B3C45590F0F93590022FF52</string>
-											<string>7B3C455A0F0F93590022FF52</string>
-											<string>7B3C45AB0F0F96750022FF52</string>
-											<string>7B3C45AC0F0F96750022FF52</string>
-											<string>7B3C45AD0F0F96750022FF52</string>
-											<string>7B3C45AE0F0F96750022FF52</string>
-											<string>7B3C45AF0F0F96750022FF52</string>
-											<string>7B3C45B00F0F96750022FF52</string>
-											<string>7B3C45B10F0F96750022FF52</string>
-											<string>7B3C45B20F0F96750022FF52</string>
-											<string>7B3C45B30F0F96750022FF52</string>
-											<string>7B3C45B40F0F96750022FF52</string>
-											<string>7B3C45B50F0F96750022FF52</string>
-											<string>7B3C45B60F0F96750022FF52</string>
-											<string>7B3C45B70F0F96750022FF52</string>
-											<string>7B3C45C50F0F97A00022FF52</string>
-											<string>7B3C45C60F0F97A00022FF52</string>
+											<string>7BD3B2810F18B3B700F2D971</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -481,14 +455,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {749, 766}}</string>
+								<string>{{0, 0}, {727, 777}}</string>
 								<key>RubberWindowFrame</key>
-								<string>302 57 1089 811 0 0 1440 878 </string>
+								<string>26 43 1067 823 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>766pt</string>
+							<string>777pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -501,9 +475,9 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 771}, {749, 0}}</string>
+								<string>{{0, 782}, {727, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>302 57 1089 811 0 0 1440 878 </string>
+								<string>26 43 1067 823 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
@@ -512,7 +486,7 @@
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>749pt</string>
+					<string>727pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
@@ -527,9 +501,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>7B3C45300F0F904C0022FF52</string>
+				<string>7BD3B2830F18B3B700F2D971</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>7B3C45310F0F904C0022FF52</string>
+				<string>7BD3B2840F18B3B700F2D971</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -648,7 +622,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>252680163.12444699</real>
+	<real>253277094.13494501</real>
 	<key>ToolbarDisplayMode</key>
 	<integer>2</integer>
 	<key>ToolbarIsVisible</key>
@@ -663,14 +637,10 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>1C530D57069F1CE1000CFCEE</string>
-		<string>1C78EAAD065D492600B07095</string>
-		<string>1CD10A99069EF8BA00B06720</string>
-		<string>7BA246320EF81BA800E7176C</string>
 		<string>/Users/oweidner/Work/SAGA/saga-projects/applications/FAUST/FAUST.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>302 57 1089 811 0 0 1440 878 </string>
+	<string>26 43 1067 823 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>

File [modified]: oweidner.pbxuser
Delta lines: +144 -1165
===================================================================
--- applications/FAUST/FAUST.xcodeproj/oweidner.pbxuser	2009-01-03 13:15:28 UTC (rev 834)
+++ applications/FAUST/FAUST.xcodeproj/oweidner.pbxuser	2009-01-10 11:10:56 UTC (rev 835)
@@ -5,7 +5,6 @@
 		activeExecutable = 7BE456D70ED9FE5C007A441F /* test */;
 		activeTarget = 7BE456D50ED9FE5C007A441F /* test */;
 		addToTargets = (
-			7BB4D6B60ED8D94100BEAF7D /* libfaust */,
 		);
 		breakpoints = (
 			7B6DA13F0EE46ADA00C9C28A /* mainpage.h:1 */,
@@ -74,7 +73,7 @@
 				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
 				PBXFileTableDataSourceColumnWidthsKey = (
 					20,
-					510,
+					488,
 					20,
 					48,
 					43,
@@ -141,11 +140,10 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 252676036;
-			PBXWorkspaceStateSaveDate = 252676036;
+			PBXPerProjectTemplateStateSaveDate = 253277093;
+			PBXWorkspaceStateSaveDate = 253277093;
 		};
 		perUserProjectItems = {
-			7B1208790EFA9520008A61EA = 7B1208790EFA9520008A61EA /* PBXTextBookmark */;
 			7B12087C0EFA9520008A61EA = 7B12087C0EFA9520008A61EA /* PBXTextBookmark */;
 			7B12087D0EFA9520008A61EA = 7B12087D0EFA9520008A61EA /* PBXTextBookmark */;
 			7B12087E0EFA9520008A61EA = 7B12087E0EFA9520008A61EA /* PBXTextBookmark */;
@@ -161,144 +159,52 @@
 			7B1209730EFAC505008A61EA = 7B1209730EFAC505008A61EA /* PBXTextBookmark */;
 			7B1209CB0EFACA72008A61EA = 7B1209CB0EFACA72008A61EA /* PBXTextBookmark */;
 			7B1209CC0EFACA72008A61EA = 7B1209CC0EFACA72008A61EA /* PBXTextBookmark */;
-			7B1209CD0EFACA72008A61EA = 7B1209CD0EFACA72008A61EA /* PBXTextBookmark */;
 			7B1209CF0EFACA72008A61EA = 7B1209CF0EFACA72008A61EA /* PBXTextBookmark */;
 			7B1209D40EFACA72008A61EA = 7B1209D40EFACA72008A61EA /* PBXTextBookmark */;
 			7B120A090EFAE0B0008A61EA = 7B120A090EFAE0B0008A61EA /* PBXTextBookmark */;
-			7B126BFD0F07D9CC00DDD72A = 7B126BFD0F07D9CC00DDD72A /* PBXTextBookmark */;
-			7B126BFE0F07D9CC00DDD72A = 7B126BFE0F07D9CC00DDD72A /* PBXTextBookmark */;
-			7B126BFF0F07D9CC00DDD72A = 7B126BFF0F07D9CC00DDD72A /* PBXTextBookmark */;
-			7B126C000F07D9CC00DDD72A = 7B126C000F07D9CC00DDD72A /* PBXTextBookmark */;
-			7B1991A70F090B76004B6B89 = 7B1991A70F090B76004B6B89 /* PBXTextBookmark */;
-			7B1991AA0F090B76004B6B89 = 7B1991AA0F090B76004B6B89 /* PBXTextBookmark */;
-			7B3C45240F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C45240F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C45250F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C45250F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C45260F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C45260F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C45270F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C45270F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C45280F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C45280F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C45290F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C45290F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C452A0F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C452A0F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C452B0F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C452B0F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C452C0F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C452C0F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C452D0F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C452D0F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C452E0F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C452E0F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C452F0F0F904C0022FF52 /* PBXTextBookmark */ = 7B3C452F0F0F904C0022FF52 /* PBXTextBookmark */;
-			7B3C453F0F0F92170022FF52 /* PBXTextBookmark */ = 7B3C453F0F0F92170022FF52 /* PBXTextBookmark */;
-			7B3C45400F0F92170022FF52 /* PBXTextBookmark */ = 7B3C45400F0F92170022FF52 /* PBXTextBookmark */;
-			7B3C45410F0F92170022FF52 /* PBXTextBookmark */ = 7B3C45410F0F92170022FF52 /* PBXTextBookmark */;
-			7B3C45420F0F92170022FF52 /* PBXTextBookmark */ = 7B3C45420F0F92170022FF52 /* PBXTextBookmark */;
-			7B3C45430F0F92170022FF52 /* PBXTextBookmark */ = 7B3C45430F0F92170022FF52 /* PBXTextBookmark */;
-			7B3C45440F0F92170022FF52 /* PBXTextBookmark */ = 7B3C45440F0F92170022FF52 /* PBXTextBookmark */;
-			7B3C45450F0F92170022FF52 /* PBXTextBookmark */ = 7B3C45450F0F92170022FF52 /* PBXTextBookmark */;
-			7B3C45460F0F92170022FF52 /* PBXTextBookmark */ = 7B3C45460F0F92170022FF52 /* PBXTextBookmark */;
-			7B3C454B0F0F93590022FF52 /* PBXTextBookmark */ = 7B3C454B0F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C454C0F0F93590022FF52 /* PBXTextBookmark */ = 7B3C454C0F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C454D0F0F93590022FF52 /* PBXTextBookmark */ = 7B3C454D0F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C454E0F0F93590022FF52 /* PBXTextBookmark */ = 7B3C454E0F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C454F0F0F93590022FF52 /* PBXTextBookmark */ = 7B3C454F0F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45500F0F93590022FF52 /* PBXTextBookmark */ = 7B3C45500F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45510F0F93590022FF52 /* PBXTextBookmark */ = 7B3C45510F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45520F0F93590022FF52 /* PBXTextBookmark */ = 7B3C45520F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45530F0F93590022FF52 /* PBXTextBookmark */ = 7B3C45530F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45540F0F93590022FF52 /* PBXTextBookmark */ = 7B3C45540F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45550F0F93590022FF52 /* PBXTextBookmark */ = 7B3C45550F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45560F0F93590022FF52 /* PBXTextBookmark */ = 7B3C45560F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45570F0F93590022FF52 /* PBXTextBookmark */ = 7B3C45570F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45580F0F93590022FF52 /* PBXTextBookmark */ = 7B3C45580F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45590F0F93590022FF52 /* PBXTextBookmark */ = 7B3C45590F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C455A0F0F93590022FF52 /* PBXTextBookmark */ = 7B3C455A0F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C455B0F0F93590022FF52 /* PBXTextBookmark */ = 7B3C455B0F0F93590022FF52 /* PBXTextBookmark */;
-			7B3C45660F0F946F0022FF52 /* PBXTextBookmark */ = 7B3C45660F0F946F0022FF52 /* PBXTextBookmark */;
-			7B3C45670F0F946F0022FF52 /* PBXTextBookmark */ = 7B3C45670F0F946F0022FF52 /* PBXTextBookmark */;
-			7B3C456B0F0F94990022FF52 /* PBXTextBookmark */ = 7B3C456B0F0F94990022FF52 /* PBXTextBookmark */;
-			7B3C456C0F0F949A0022FF52 /* PBXTextBookmark */ = 7B3C456C0F0F949A0022FF52 /* PBXTextBookmark */;
-			7B3C456D0F0F949A0022FF52 /* PBXTextBookmark */ = 7B3C456D0F0F949A0022FF52 /* PBXTextBookmark */;
-			7B3C456F0F0F94C40022FF52 /* PBXTextBookmark */ = 7B3C456F0F0F94C40022FF52 /* PBXTextBookmark */;
-			7B3C45700F0F94C40022FF52 /* PBXTextBookmark */ = 7B3C45700F0F94C40022FF52 /* PBXTextBookmark */;
-			7B3C45710F0F94C40022FF52 /* PBXTextBookmark */ = 7B3C45710F0F94C40022FF52 /* PBXTextBookmark */;
-			7B3C45730F0F94DC0022FF52 /* PBXTextBookmark */ = 7B3C45730F0F94DC0022FF52 /* PBXTextBookmark */;
-			7B3C45740F0F94DC0022FF52 /* PBXTextBookmark */ = 7B3C45740F0F94DC0022FF52 /* PBXTextBookmark */;
-			7B3C45750F0F94DC0022FF52 /* PBXTextBookmark */ = 7B3C45750F0F94DC0022FF52 /* PBXTextBookmark */;
-			7B3C45760F0F94DD0022FF52 /* PBXTextBookmark */ = 7B3C45760F0F94DD0022FF52 /* PBXTextBookmark */;
-			7B3C45770F0F94E20022FF52 /* PBXTextBookmark */ = 7B3C45770F0F94E20022FF52 /* PBXTextBookmark */;
-			7B3C45790F0F95270022FF52 /* PBXTextBookmark */ = 7B3C45790F0F95270022FF52 /* PBXTextBookmark */;
-			7B3C457A0F0F95280022FF52 /* PBXTextBookmark */ = 7B3C457A0F0F95280022FF52 /* PBXTextBookmark */;
-			7B3C457B0F0F95280022FF52 /* PBXTextBookmark */ = 7B3C457B0F0F95280022FF52 /* PBXTextBookmark */;
-			7B3C457D0F0F95390022FF52 /* PBXTextBookmark */ = 7B3C457D0F0F95390022FF52 /* PBXTextBookmark */;
-			7B3C457E0F0F953A0022FF52 /* PBXTextBookmark */ = 7B3C457E0F0F953A0022FF52 /* PBXTextBookmark */;
-			7B3C457F0F0F953A0022FF52 /* PBXTextBookmark */ = 7B3C457F0F0F953A0022FF52 /* PBXTextBookmark */;
-			7B3C45810F0F953F0022FF52 /* PBXTextBookmark */ = 7B3C45810F0F953F0022FF52 /* PBXTextBookmark */;
-			7B3C45820F0F953F0022FF52 /* PBXTextBookmark */ = 7B3C45820F0F953F0022FF52 /* PBXTextBookmark */;
-			7B3C45830F0F953F0022FF52 /* PBXTextBookmark */ = 7B3C45830F0F953F0022FF52 /* PBXTextBookmark */;
-			7B3C45840F0F95590022FF52 /* PBXTextBookmark */ = 7B3C45840F0F95590022FF52 /* PBXTextBookmark */;
-			7B3C45860F0F956C0022FF52 /* PBXTextBookmark */ = 7B3C45860F0F956C0022FF52 /* PBXTextBookmark */;
-			7B3C45870F0F956F0022FF52 /* PBXTextBookmark */ = 7B3C45870F0F956F0022FF52 /* PBXTextBookmark */;
-			7B3C45880F0F956F0022FF52 /* PBXTextBookmark */ = 7B3C45880F0F956F0022FF52 /* PBXTextBookmark */;
-			7B3C45890F0F956F0022FF52 /* PBXTextBookmark */ = 7B3C45890F0F956F0022FF52 /* PBXTextBookmark */;
-			7B3C458B0F0F957A0022FF52 /* PBXTextBookmark */ = 7B3C458B0F0F957A0022FF52 /* PBXTextBookmark */;
-			7B3C458C0F0F957A0022FF52 /* PBXTextBookmark */ = 7B3C458C0F0F957A0022FF52 /* PBXTextBookmark */;
-			7B3C458D0F0F957A0022FF52 /* PBXTextBookmark */ = 7B3C458D0F0F957A0022FF52 /* PBXTextBookmark */;
-			7B3C458F0F0F95810022FF52 /* PBXTextBookmark */ = 7B3C458F0F0F95810022FF52 /* PBXTextBookmark */;
-			7B3C45900F0F95810022FF52 /* PBXTextBookmark */ = 7B3C45900F0F95810022FF52 /* PBXTextBookmark */;
-			7B3C45910F0F95810022FF52 /* PBXTextBookmark */ = 7B3C45910F0F95810022FF52 /* PBXTextBookmark */;
-			7B3C45920F0F95AB0022FF52 /* PBXTextBookmark */ = 7B3C45920F0F95AB0022FF52 /* PBXTextBookmark */;
-			7B3C45930F0F95B10022FF52 /* PBXTextBookmark */ = 7B3C45930F0F95B10022FF52 /* PBXTextBookmark */;
-			7B3C45940F0F95B10022FF52 /* PBXTextBookmark */ = 7B3C45940F0F95B10022FF52 /* PBXTextBookmark */;
-			7B3C45950F0F95B10022FF52 /* PBXTextBookmark */ = 7B3C45950F0F95B10022FF52 /* PBXTextBookmark */;
-			7B3C45960F0F95B10022FF52 /* PBXTextBookmark */ = 7B3C45960F0F95B10022FF52 /* PBXTextBookmark */;
-			7B3C45970F0F95C00022FF52 /* PBXTextBookmark */ = 7B3C45970F0F95C00022FF52 /* PBXTextBookmark */;
-			7B3C45990F0F95E80022FF52 /* PBXTextBookmark */ = 7B3C45990F0F95E80022FF52 /* PBXTextBookmark */;
-			7B3C459A0F0F95E80022FF52 /* PBXTextBookmark */ = 7B3C459A0F0F95E80022FF52 /* PBXTextBookmark */;
-			7B3C459B0F0F95E80022FF52 /* PBXTextBookmark */ = 7B3C459B0F0F95E80022FF52 /* PBXTextBookmark */;
-			7B3C459D0F0F95ED0022FF52 /* PBXTextBookmark */ = 7B3C459D0F0F95ED0022FF52 /* PBXTextBookmark */;
-			7B3C459E0F0F95ED0022FF52 /* PBXTextBookmark */ = 7B3C459E0F0F95ED0022FF52 /* PBXTextBookmark */;
-			7B3C459F0F0F95ED0022FF52 /* PBXTextBookmark */ = 7B3C459F0F0F95ED0022FF52 /* PBXTextBookmark */;
-			7B3C45A00F0F960F0022FF52 /* PBXTextBookmark */ = 7B3C45A00F0F960F0022FF52 /* PBXTextBookmark */;
-			7B3C45A10F0F965A0022FF52 /* PBXTextBookmark */ = 7B3C45A10F0F965A0022FF52 /* PBXTextBookmark */;
-			7B3C45A20F0F965A0022FF52 /* PBXBookmark */ = 7B3C45A20F0F965A0022FF52 /* PBXBookmark */;
-			7B3C45A30F0F965A0022FF52 /* PBXTextBookmark */ = 7B3C45A30F0F965A0022FF52 /* PBXTextBookmark */;
-			7B3C45A40F0F965A0022FF52 /* PBXTextBookmark */ = 7B3C45A40F0F965A0022FF52 /* PBXTextBookmark */;
-			7B3C45A50F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45A50F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45A60F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45A60F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45A70F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45A70F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45A80F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45A80F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45A90F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45A90F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45AA0F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45AA0F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45AB0F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45AB0F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45AC0F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45AC0F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45AD0F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45AD0F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45AE0F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45AE0F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45AF0F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45AF0F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45B00F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45B00F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45B10F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45B10F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45B20F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45B20F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45B30F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45B30F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45B40F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45B40F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45B50F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45B50F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45B60F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45B60F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45B70F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45B70F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45B80F0F96750022FF52 /* PBXTextBookmark */ = 7B3C45B80F0F96750022FF52 /* PBXTextBookmark */;
-			7B3C45BA0F0F96BA0022FF52 /* PBXTextBookmark */ = 7B3C45BA0F0F96BA0022FF52 /* PBXTextBookmark */;
-			7B3C45BB0F0F96BA0022FF52 /* PBXTextBookmark */ = 7B3C45BB0F0F96BA0022FF52 /* PBXTextBookmark */;
-			7B3C45BC0F0F96BA0022FF52 /* PBXTextBookmark */ = 7B3C45BC0F0F96BA0022FF52 /* PBXTextBookmark */;
-			7B3C45BE0F0F97320022FF52 /* PBXTextBookmark */ = 7B3C45BE0F0F97320022FF52 /* PBXTextBookmark */;
-			7B3C45BF0F0F97400022FF52 /* PBXTextBookmark */ = 7B3C45BF0F0F97400022FF52 /* PBXTextBookmark */;
-			7B3C45C00F0F97400022FF52 /* PBXTextBookmark */ = 7B3C45C00F0F97400022FF52 /* PBXTextBookmark */;
-			7B3C45C10F0F97400022FF52 /* PBXTextBookmark */ = 7B3C45C10F0F97400022FF52 /* PBXTextBookmark */;
-			7B3C45C30F0F97A00022FF52 /* PBXTextBookmark */ = 7B3C45C30F0F97A00022FF52 /* PBXTextBookmark */;
-			7B3C45C40F0F97A00022FF52 /* PBXTextBookmark */ = 7B3C45C40F0F97A00022FF52 /* PBXTextBookmark */;
-			7B3C45C50F0F97A00022FF52 /* PBXTextBookmark */ = 7B3C45C50F0F97A00022FF52 /* PBXTextBookmark */;
-			7B3C45C60F0F97A00022FF52 /* PBXTextBookmark */ = 7B3C45C60F0F97A00022FF52 /* PBXTextBookmark */;
-			7B3C45C70F0F97A00022FF52 /* PBXTextBookmark */ = 7B3C45C70F0F97A00022FF52 /* PBXTextBookmark */;
-			7B3C45C80F0F97A70022FF52 /* PBXTextBookmark */ = 7B3C45C80F0F97A70022FF52 /* PBXTextBookmark */;
-			7B3C45C90F0F97A80022FF52 /* PBXTextBookmark */ = 7B3C45C90F0F97A80022FF52 /* PBXTextBookmark */;
-			7B3C45CA0F0F97A80022FF52 /* PBXTextBookmark */ = 7B3C45CA0F0F97A80022FF52 /* PBXTextBookmark */;
-			7B3C45CC0F0F97D10022FF52 /* PBXTextBookmark */ = 7B3C45CC0F0F97D10022FF52 /* PBXTextBookmark */;
-			7B3C45CD0F0F97DE0022FF52 /* PBXTextBookmark */ = 7B3C45CD0F0F97DE0022FF52 /* PBXTextBookmark */;
-			7B3C45CE0F0F97DE0022FF52 /* PBXTextBookmark */ = 7B3C45CE0F0F97DE0022FF52 /* PBXTextBookmark */;
-			7B3C45CF0F0F97DE0022FF52 /* PBXTextBookmark */ = 7B3C45CF0F0F97DE0022FF52 /* PBXTextBookmark */;
-			7B3C45D00F0F97E30022FF52 /* PBXTextBookmark */ = 7B3C45D00F0F97E30022FF52 /* PBXTextBookmark */;
-			7B4E92B20EDB05CB000F4094 = 7B4E92B20EDB05CB000F4094 /* PBXTextBookmark */;
+			7B3C45290F0F904C0022FF52 = 7B3C45290F0F904C0022FF52 /* PBXTextBookmark */;
+			7B3C452A0F0F904C0022FF52 = 7B3C452A0F0F904C0022FF52 /* PBXTextBookmark */;
+			7B3C452B0F0F904C0022FF52 = 7B3C452B0F0F904C0022FF52 /* PBXTextBookmark */;
+			7B3C452D0F0F904C0022FF52 = 7B3C452D0F0F904C0022FF52 /* PBXTextBookmark */;
+			7B3C45430F0F92170022FF52 = 7B3C45430F0F92170022FF52 /* PBXTextBookmark */;
+			7B3C454F0F0F93590022FF52 = 7B3C454F0F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C45510F0F93590022FF52 = 7B3C45510F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C45520F0F93590022FF52 = 7B3C45520F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C45530F0F93590022FF52 = 7B3C45530F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C45540F0F93590022FF52 = 7B3C45540F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C45550F0F93590022FF52 = 7B3C45550F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C45560F0F93590022FF52 = 7B3C45560F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C45570F0F93590022FF52 = 7B3C45570F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C45580F0F93590022FF52 = 7B3C45580F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C45590F0F93590022FF52 = 7B3C45590F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C455A0F0F93590022FF52 = 7B3C455A0F0F93590022FF52 /* PBXTextBookmark */;
+			7B3C45A50F0F96750022FF52 = 7B3C45A50F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45A60F0F96750022FF52 = 7B3C45A60F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45A70F0F96750022FF52 = 7B3C45A70F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45A80F0F96750022FF52 = 7B3C45A80F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45A90F0F96750022FF52 = 7B3C45A90F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45AB0F0F96750022FF52 = 7B3C45AB0F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45AC0F0F96750022FF52 = 7B3C45AC0F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45AD0F0F96750022FF52 = 7B3C45AD0F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45AE0F0F96750022FF52 = 7B3C45AE0F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45AF0F0F96750022FF52 = 7B3C45AF0F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45B00F0F96750022FF52 = 7B3C45B00F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45B10F0F96750022FF52 = 7B3C45B10F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45B20F0F96750022FF52 = 7B3C45B20F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45B30F0F96750022FF52 = 7B3C45B30F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45B40F0F96750022FF52 = 7B3C45B40F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45B50F0F96750022FF52 = 7B3C45B50F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45B60F0F96750022FF52 = 7B3C45B60F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45B70F0F96750022FF52 = 7B3C45B70F0F96750022FF52 /* PBXTextBookmark */;
+			7B3C45C30F0F97A00022FF52 = 7B3C45C30F0F97A00022FF52 /* PBXTextBookmark */;
+			7B3C45C50F0F97A00022FF52 = 7B3C45C50F0F97A00022FF52 /* PBXTextBookmark */;
+			7B3C45C60F0F97A00022FF52 = 7B3C45C60F0F97A00022FF52 /* PBXTextBookmark */;
+			7B3C45D50F0F9E100022FF52 = 7B3C45D50F0F9E100022FF52 /* PBXTextBookmark */;
+			7B3C45D60F0F9E100022FF52 = 7B3C45D60F0F9E100022FF52 /* PBXTextBookmark */;
+			7B3C45D70F0F9E100022FF52 = 7B3C45D70F0F9E100022FF52 /* PBXTextBookmark */;
+			7B3C45D80F0F9E100022FF52 = 7B3C45D80F0F9E100022FF52 /* PBXTextBookmark */;
+			7B3C45D90F0F9E100022FF52 = 7B3C45D90F0F9E100022FF52 /* PBXTextBookmark */;
+			7B3C45DB0F0FA0A50022FF52 = 7B3C45DB0F0FA0A50022FF52 /* PBXTextBookmark */;
 			7B4E962F0EDB4EA9000F4094 = 7B4E962F0EDB4EA9000F4094 /* PBXTextBookmark */;
 			7B4E981D0EDB6C17000F4094 = 7B4E981D0EDB6C17000F4094 /* PBXTextBookmark */;
 			7B4E98240EDB6C17000F4094 = 7B4E98240EDB6C17000F4094 /* PBXTextBookmark */;
@@ -307,7 +213,6 @@
 			7B6E5B100EE3772C00FD0939 = 7B6E5B100EE3772C00FD0939 /* PBXTextBookmark */;
 			7B6E5B400EE3772C00FD0939 = 7B6E5B400EE3772C00FD0939 /* PBXTextBookmark */;
 			7B6E5B420EE3772C00FD0939 = 7B6E5B420EE3772C00FD0939 /* PBXTextBookmark */;
-			7B71BB630F0933AD00D59E0A = 7B71BB630F0933AD00D59E0A /* PBXTextBookmark */;
 			7B735B3B0EE4A13E004180FE = 7B735B3B0EE4A13E004180FE /* PBXTextBookmark */;
 			7B7E4A160EF012D400E7E3AE = 7B7E4A160EF012D400E7E3AE /* PBXTextBookmark */;
 			7B7E4A750EF01F8200E7E3AE = 7B7E4A750EF01F8200E7E3AE /* PBXTextBookmark */;
@@ -329,10 +234,8 @@
 			7BB738FA0EEDD6EF00931970 = 7BB738FA0EEDD6EF00931970 /* PBXTextBookmark */;
 			7BB739000EEDD6EF00931970 = 7BB739000EEDD6EF00931970 /* PBXTextBookmark */;
 			7BB739060EEDD6EF00931970 = 7BB739060EEDD6EF00931970 /* PBXTextBookmark */;
-			7BB7390D0EEDD6EF00931970 = 7BB7390D0EEDD6EF00931970 /* PBXTextBookmark */;
 			7BB739100EEDD6EF00931970 = 7BB739100EEDD6EF00931970 /* PBXTextBookmark */;
 			7BB739170EEDD6EF00931970 = 7BB739170EEDD6EF00931970 /* PBXTextBookmark */;
-			7BB739180EEDD6EF00931970 = 7BB739180EEDD6EF00931970 /* PBXTextBookmark */;
 			7BB7391B0EEDD6EF00931970 = 7BB7391B0EEDD6EF00931970 /* PBXTextBookmark */;
 			7BB7391C0EEDD6EF00931970 = 7BB7391C0EEDD6EF00931970 /* PBXTextBookmark */;
 			7BC889AD0EF956FA008AAF9F = 7BC889AD0EF956FA008AAF9F /* PBXTextBookmark */;
@@ -341,12 +244,14 @@
 			7BC889B70EF956FA008AAF9F = 7BC889B70EF956FA008AAF9F /* PBXTextBookmark */;
 			7BC889CF0EF956FA008AAF9F = 7BC889CF0EF956FA008AAF9F /* PBXTextBookmark */;
 			7BC889D00EF956FA008AAF9F = 7BC889D00EF956FA008AAF9F /* PBXTextBookmark */;
-			7BC88A620EF985B4008AAF9F = 7BC88A620EF985B4008AAF9F /* PBXTextBookmark */;
 			7BC88A640EF985B4008AAF9F = 7BC88A640EF985B4008AAF9F /* PBXTextBookmark */;
 			7BC88A690EF985B4008AAF9F = 7BC88A690EF985B4008AAF9F /* PBXTextBookmark */;
-			7BC88A7B0EF98704008AAF9F = 7BC88A7B0EF98704008AAF9F /* PBXTextBookmark */;
 			7BC88AC00EF98BDC008AAF9F = 7BC88AC00EF98BDC008AAF9F /* PBXTextBookmark */;
 			7BC88AE90EF98D08008AAF9F = 7BC88AE90EF98D08008AAF9F /* PBXTextBookmark */;
+			7BD3B27F0F18B3B700F2D971 /* PBXTextBookmark */ = 7BD3B27F0F18B3B700F2D971 /* PBXTextBookmark */;
+			7BD3B2800F18B3B700F2D971 /* PBXTextBookmark */ = 7BD3B2800F18B3B700F2D971 /* PBXTextBookmark */;
+			7BD3B2810F18B3B700F2D971 /* PBXTextBookmark */ = 7BD3B2810F18B3B700F2D971 /* PBXTextBookmark */;
+			7BD3B2820F18B3B700F2D971 /* PBXTextBookmark */ = 7BD3B2820F18B3B700F2D971 /* PBXTextBookmark */;
 			7BE4597D0EDA6FB6007A441F = 7BE4597D0EDA6FB6007A441F /* PBXTextBookmark */;
 		};
 		sourceControlManager = 7B121AE80E9C0A77009B1748 /* Source Control */;
@@ -360,16 +265,6 @@
 			sepNavVisRange = "{1005, 431}";
 		};
 	};
-	7B1208790EFA9520008A61EA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738610EEDAF0F00931970 /* resource.hpp */;
-		name = "resource.hpp: 12";
-		rLen = 0;
-		rLoc = 394;
-		rType = 0;
-		vrLen = 855;
-		vrLoc = 0;
-	};
 	7B12087C0EFA9520008A61EA /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7B7E4A630EF01BC100E7E3AE /* job_dag.hpp */;
@@ -520,16 +415,6 @@
 		vrLen = 2433;
 		vrLoc = 0;
 	};
-	7B1209CD0EFACA72008A61EA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738640EEDAF0F00931970 /* state.hpp */;
-		name = "state.hpp: 22";
-		rLen = 22;
-		rLoc = 666;
-		rType = 0;
-		vrLen = 1132;
-		vrLoc = 0;
-	};
 	7B1209CF0EFACA72008A61EA /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7B7E4B010EF0430000E7E3AE /* object.cpp */;
@@ -572,66 +457,6 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	7B126BFD0F07D9CC00DDD72A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB4D72E0ED8DDC000BEAF7D /* main.cpp */;
-		name = "main.cpp: 76";
-		rLen = 0;
-		rLoc = 1396;
-		rType = 0;
-		vrLen = 1577;
-		vrLoc = 952;
-	};
-	7B126BFE0F07D9CC00DDD72A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738620EEDAF0F00931970 /* service.cpp */;
-		name = "service.cpp: 31";
-		rLen = 0;
-		rLoc = 1020;
-		rType = 0;
-		vrLen = 1697;
-		vrLoc = 0;
-	};
-	7B126BFF0F07D9CC00DDD72A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 276";
-		rLen = 0;
-		rLoc = 8520;
-		rType = 0;
-		vrLen = 1825;
-		vrLoc = 7286;
-	};
-	7B126C000F07D9CC00DDD72A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738540EEDAEFE00931970 /* service_impl.hpp */;
-		name = "service_impl.hpp: 35";
-		rLen = 0;
-		rLoc = 955;
-		rType = 0;
-		vrLen = 1961;
-		vrLoc = 535;
-	};
-	7B1991A70F090B76004B6B89 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738630EEDAF0F00931970 /* service.hpp */;
-		name = "service.hpp: 84";
-		rLen = 0;
-		rLoc = 2554;
-		rType = 0;
-		vrLen = 1655;
-		vrLoc = 534;
-	};
-	7B1991AA0F090B76004B6B89 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 26";
-		rLen = 117;
-		rLoc = 1293;
-		rType = 0;
-		vrLen = 1856;
-		vrLoc = 0;
-	};
 	7B3C451A0F0F8FC40022FF52 /* service.cpp */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.cpp.cpp;
@@ -639,76 +464,18 @@
 		path = "/Users/oweidner/Work/SAGA/saga-projects/applications/FAUST/faust/faust/service.cpp";
 		sourceTree = "<absolute>";
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {688, 1876}}";
-			sepNavSelRange = "{3709, 0}";
-			sepNavVisRange = "{2873, 1026}";
+			sepNavIntBoundsRect = "{{0, 0}, {666, 1890}}";
+			sepNavSelRange = "{1022, 0}";
+			sepNavVisRange = "{0, 1619}";
 		};
 	};
-	7B3C451D0F0F8FD70022FF52 /* main.cpp */ = {
-		isa = PBXFileReference;
-		name = main.cpp;
-		path = "/Users/oweidner/Work/SAGA/saga-projects/applications/FAUST/faust/main.cpp";
-		sourceTree = "<absolute>";
-	};
 	7B3C45200F0F8FD80022FF52 /* main.cpp */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.cpp.cpp;
 		name = main.cpp;
 		path = "/Users/oweidner/Work/SAGA/saga-projects/applications/FAUST/faust/main.cpp";
 		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {688, 910}}";
-			sepNavSelRange = "{1281, 0}";
-			sepNavVisRange = "{375, 1587}";
-		};
 	};
-	7B3C45240F0F904C0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 21";
-		rLen = 0;
-		rLoc = 827;
-		rType = 0;
-		vrLen = 1856;
-		vrLoc = 0;
-	};
-	7B3C45250F0F904C0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738610EEDAF0F00931970 /* resource.hpp */;
-		name = "resource.hpp: 12";
-		rLen = 0;
-		rLoc = 394;
-		rType = 0;
-		vrLen = 878;
-		vrLoc = 0;
-	};
-	7B3C45260F0F904C0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738630EEDAF0F00931970 /* service.hpp */;
-		name = "service.hpp: 125";
-		rLen = 0;
-		rLoc = 3874;
-		rType = 0;
-		vrLen = 1236;
-		vrLoc = 2926;
-	};
-	7B3C45270F0F904C0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B3C451A0F0F8FC40022FF52 /* service.cpp */;
-		name = "service.cpp: 126";
-		rLen = 0;
-		rLoc = 4012;
-		rType = 0;
-		vrLen = 950;
-		vrLoc = 2873;
-	};
-	7B3C45280F0F904C0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B3C451D0F0F8FD70022FF52 /* main.cpp */;
-		rLen = 0;
-		rLoc = 41;
-		rType = 1;
-	};
 	7B3C45290F0F904C0022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
@@ -739,16 +506,6 @@
 		vrLen = 1856;
 		vrLoc = 1730;
 	};
-	7B3C452C0F0F904C0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738620EEDAF0F00931970 /* service.cpp */;
-		name = "service.cpp: 31";
-		rLen = 0;
-		rLoc = 1020;
-		rType = 0;
-		vrLen = 1610;
-		vrLoc = 146;
-	};
 	7B3C452D0F0F904C0022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7BB738630EEDAF0F00931970 /* service.hpp */;
@@ -759,66 +516,6 @@
 		vrLen = 1236;
 		vrLoc = 2926;
 	};
-	7B3C452E0F0F904C0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B3C451A0F0F8FC40022FF52 /* service.cpp */;
-		name = "service.cpp: 126";
-		rLen = 0;
-		rLoc = 4012;
-		rType = 0;
-		vrLen = 950;
-		vrLoc = 2873;
-	};
-	7B3C452F0F0F904C0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B3C45200F0F8FD80022FF52 /* main.cpp */;
-		name = "main.cpp: 46";
-		rLen = 0;
-		rLoc = 1316;
-		rType = 0;
-		vrLen = 994;
-		vrLoc = 461;
-	};
-	7B3C453F0F0F92170022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 95";
-		rLen = 0;
-		rLoc = 3426;
-		rType = 0;
-		vrLen = 1443;
-		vrLoc = 2575;
-	};
-	7B3C45400F0F92170022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738540EEDAEFE00931970 /* service_impl.hpp */;
-		name = "service_impl.hpp: 35";
-		rLen = 0;
-		rLoc = 955;
-		rType = 0;
-		vrLen = 1019;
-		vrLoc = 535;
-	};
-	7B3C45410F0F92170022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B3C451A0F0F8FC40022FF52 /* service.cpp */;
-		name = "service.cpp: 126";
-		rLen = 0;
-		rLoc = 4012;
-		rType = 0;
-		vrLen = 1031;
-		vrLoc = 2792;
-	};
-	7B3C45420F0F92170022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B3C45200F0F8FD80022FF52 /* main.cpp */;
-		name = "main.cpp: 46";
-		rLen = 0;
-		rLoc = 1316;
-		rType = 0;
-		vrLen = 997;
-		vrLoc = 461;
-	};
 	7B3C45430F0F92170022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7B3C451A0F0F8FC40022FF52 /* service.cpp */;
@@ -829,76 +526,6 @@
 		vrLen = 1031;
 		vrLoc = 2792;
 	};
-	7B3C45440F0F92170022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 95";
-		rLen = 0;
-		rLoc = 3426;
-		rType = 0;
-		vrLen = 1443;
-		vrLoc = 2575;
-	};
-	7B3C45450F0F92170022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738540EEDAEFE00931970 /* service_impl.hpp */;
-		name = "service_impl.hpp: 35";
-		rLen = 0;
-		rLoc = 955;
-		rType = 0;
-		vrLen = 1019;
-		vrLoc = 535;
-	};
-	7B3C45460F0F92170022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B3C45200F0F8FD80022FF52 /* main.cpp */;
-		name = "main.cpp: 50";
-		rLen = 0;
-		rLoc = 1503;
-		rType = 0;
-		vrLen = 968;
-		vrLoc = 532;
-	};
-	7B3C454B0F0F93590022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738630EEDAF0F00931970 /* service.hpp */;
-		name = "service.hpp: 250";
-		rLen = 50;
-		rLoc = 8905;
-		rType = 0;
-		vrLen = 905;
-		vrLoc = 8104;
-	};
-	7B3C454C0F0F93590022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B3C451A0F0F8FC40022FF52 /* service.cpp */;
-		name = "service.cpp: 121";
-		rLen = 0;
-		rLoc = 3709;
-		rType = 0;
-		vrLen = 1026;
-		vrLoc = 2873;
-	};
-	7B3C454D0F0F93590022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 147";
-		rLen = 0;
-		rLoc = 4800;
-		rType = 0;
-		vrLen = 808;
-		vrLoc = 4305;
-	};
-	7B3C454E0F0F93590022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738540EEDAEFE00931970 /* service_impl.hpp */;
-		name = "service_impl.hpp: 44";
-		rLen = 0;
-		rLoc = 1296;
-		rType = 0;
-		vrLen = 1174;
-		vrLoc = 745;
-	};
 	7B3C454F0F0F93590022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7BB738610EEDAF0F00931970 /* resource.hpp */;
@@ -909,16 +536,6 @@
 		vrLen = 878;
 		vrLoc = 0;
 	};
-	7B3C45500F0F93590022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B3C45200F0F8FD80022FF52 /* main.cpp */;
-		name = "main.cpp: 50";
-		rLen = 0;
-		rLoc = 1503;
-		rType = 0;
-		vrLen = 968;
-		vrLoc = 532;
-	};
 	7B3C45510F0F93590022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7B3C45200F0F8FD80022FF52 /* main.cpp */;
@@ -1019,501 +636,6 @@
 		vrLen = 878;
 		vrLoc = 0;
 	};
-	7B3C455B0F0F93590022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B3C45200F0F8FD80022FF52 /* main.cpp */;
-		name = "main.cpp: 46";
-		rLen = 0;
-		rLoc = 1301;
-		rType = 0;
-		vrLen = 1150;
-		vrLoc = 532;
-	};
-	7B3C45660F0F946F0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		rLen = 5;
-		rLoc = 8383;
-		rType = 0;
-	};
-	7B3C45670F0F946F0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 275";
-		rLen = 71;
-		rLoc = 8383;
-		rType = 0;
-		vrLen = 550;
-		vrLoc = 8215;
-	};
-	7B3C456B0F0F94990022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 275";
-		rLen = 71;
-		rLoc = 8383;
-		rType = 0;
-		vrLen = 567;
-		vrLoc = 8190;
-	};
-	7B3C456C0F0F949A0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 275";
-		rLen = 71;
-		rLoc = 8383;
-		rType = 0;
-		vrLen = 567;
-		vrLoc = 8190;
-	};
-	7B3C456D0F0F949A0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 275";
-		rLen = 71;
-		rLoc = 8383;
-		rType = 0;
-		vrLen = 567;
-		vrLoc = 8190;
-	};
-	7B3C456F0F0F94C40022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 280";
-		rLen = 0;
-		rLoc = 8598;
-		rType = 0;
-		vrLen = 493;
-		vrLoc = 8220;
-	};
-	7B3C45700F0F94C40022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 280";
-		rLen = 0;
-		rLoc = 8598;
-		rType = 0;
-		vrLen = 493;
-		vrLoc = 8220;
-	};
-	7B3C45710F0F94C40022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 280";
-		rLen = 0;
-		rLoc = 8598;
-		rType = 0;
-		vrLen = 493;
-		vrLoc = 8220;
-	};
-	7B3C45730F0F94DC0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		rLen = 5;
-		rLoc = 8888;
-		rType = 0;
-	};
-	7B3C45740F0F94DC0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C45750F0F94DC0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C45760F0F94DD0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C45770F0F94E20022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C45790F0F95270022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C457A0F0F95280022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C457B0F0F95280022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C457D0F0F95390022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C457E0F0F953A0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C457F0F0F953A0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C45810F0F953F0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C45820F0F953F0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C45830F0F953F0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C45840F0F95590022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8712;
-	};
-	7B3C45860F0F956C0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8723;
-	};
-	7B3C45870F0F956F0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8724;
-	};
-	7B3C45880F0F956F0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8724;
-	};
-	7B3C45890F0F956F0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8724;
-	};
-	7B3C458B0F0F957A0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8726;
-	};
-	7B3C458C0F0F957A0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8726;
-	};
-	7B3C458D0F0F957A0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8726;
-	};
-	7B3C458F0F0F95810022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8726;
-	};
-	7B3C45900F0F95810022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8726;
-	};
-	7B3C45910F0F95810022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8726;
-	};
-	7B3C45920F0F95AB0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8726;
-	};
-	7B3C45930F0F95B10022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8726;
-	};
-	7B3C45940F0F95B10022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-	};
-	7B3C45950F0F95B10022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738530EEDAEFE00931970 /* service_impl.cpp */;
-		name = "service_impl.cpp: 295";
-		rLen = 0;
-		rLoc = 9108;
-		rType = 0;
-		vrLen = 516;
-		vrLoc = 8726;
-	};
-	7B3C45960F0F95B10022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C45970F0F95C00022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C45990F0F95E80022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C459A0F0F95E80022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C459B0F0F95E80022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C459D0F0F95ED0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C459E0F0F95ED0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C459F0F0F95ED0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C45A00F0F960F0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C45A10F0F965A0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C45A20F0F965A0022FF52 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-	};
-	7B3C45A30F0F965A0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7B6E5A930EE372F300FD0939 /* logwriter.cpp */;
-		name = "logwriter.cpp: 66";
-		rLen = 5;
-		rLoc = 1724;
-		rType = 0;
-		vrLen = 348;
-		vrLoc = 1548;
-	};
-	7B3C45A40F0F965A0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 21";
-		rLen = 0;
-		rLoc = 827;
-		rType = 0;
-		vrLen = 494;
-		vrLoc = 383;
-	};
 	7B3C45A50F0F96750022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7BB738640EEDAF0F00931970 /* state.hpp */;
@@ -1564,16 +686,6 @@
 		vrLen = 1629;
 		vrLoc = 0;
 	};
-	7B3C45AA0F0F96750022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 21";
-		rLen = 0;
-		rLoc = 827;
-		rType = 0;
-		vrLen = 1780;
-		vrLoc = 0;
-	};
 	7B3C45AB0F0F96750022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7B3C45200F0F8FD80022FF52 /* main.cpp */;
@@ -1704,86 +816,6 @@
 		vrLen = 1629;
 		vrLoc = 0;
 	};
-	7B3C45B80F0F96750022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 21";
-		rLen = 0;
-		rLoc = 826;
-		rType = 0;
-		vrLen = 1782;
-		vrLoc = 0;
-	};
-	7B3C45BA0F0F96BA0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 23";
-		rLen = 0;
-		rLoc = 833;
-		rType = 0;
-		vrLen = 331;
-		vrLoc = 383;
-	};
-	7B3C45BB0F0F96BA0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 23";
-		rLen = 0;
-		rLoc = 833;
-		rType = 0;
-		vrLen = 331;
-		vrLoc = 383;
-	};
-	7B3C45BC0F0F96BA0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 23";
-		rLen = 0;
-		rLoc = 833;
-		rType = 0;
-		vrLen = 331;
-		vrLoc = 383;
-	};
-	7B3C45BE0F0F97320022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 35";
-		rLen = 0;
-		rLoc = 2069;
-		rType = 0;
-		vrLen = 1880;
-		vrLoc = 0;
-	};
-	7B3C45BF0F0F97400022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 23";
-		rLen = 0;
-		rLoc = 833;
-		rType = 0;
-		vrLen = 483;
-		vrLoc = 383;
-	};
-	7B3C45C00F0F97400022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 23";
-		rLen = 0;
-		rLoc = 833;
-		rType = 0;
-		vrLen = 483;
-		vrLoc = 383;
-	};
-	7B3C45C10F0F97400022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 23";
-		rLen = 0;
-		rLoc = 833;
-		rType = 0;
-		vrLen = 483;
-		vrLoc = 383;
-	};
 	7B3C45C30F0F97A00022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7BB7385B0EEDAF0F00931970 /* description.cpp */;
@@ -1794,16 +826,6 @@
 		vrLen = 855;
 		vrLoc = 0;
 	};
-	7B3C45C40F0F97A00022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 35";
-		rLen = 0;
-		rLoc = 2069;
-		rType = 0;
-		vrLen = 1880;
-		vrLoc = 0;
-	};
 	7B3C45C50F0F97A00022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
@@ -1824,106 +846,66 @@
 		vrLen = 855;
 		vrLoc = 0;
 	};
-	7B3C45C70F0F97A00022FF52 /* PBXTextBookmark */ = {
+	7B3C45D50F0F9E100022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 44";
+		name = "description.hpp: 24";
 		rLen = 0;
-		rLoc = 2064;
+		rLoc = 671;
 		rType = 0;
-		vrLen = 2209;
+		vrLen = 2161;
 		vrLoc = 0;
 	};
-	7B3C45C80F0F97A70022FF52 /* PBXTextBookmark */ = {
+	7B3C45D60F0F9E100022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 23";
-		rLen = 0;
-		rLoc = 833;
+		fRef = 7BB738630EEDAF0F00931970 /* service.hpp */;
+		name = "service.hpp: 111";
+		rLen = 1;
+		rLoc = 3447;
 		rType = 0;
-		vrLen = 458;
-		vrLoc = 383;
+		vrLen = 1736;
+		vrLoc = 2704;
 	};
-	7B3C45C90F0F97A80022FF52 /* PBXTextBookmark */ = {
+	7B3C45D70F0F9E100022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 23";
+		fRef = 7B3C451A0F0F8FC40022FF52 /* service.cpp */;
+		name = "service.cpp: 121";
 		rLen = 0;
-		rLoc = 833;
+		rLoc = 3709;
 		rType = 0;
-		vrLen = 458;
-		vrLoc = 383;
+		vrLen = 1515;
+		vrLoc = 2500;
 	};
-	7B3C45CA0F0F97A80022FF52 /* PBXTextBookmark */ = {
+	7B3C45D80F0F9E100022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 23";
-		rLen = 0;
-		rLoc = 833;
-		rType = 0;
-		vrLen = 458;
-		vrLoc = 383;
-	};
-	7B3C45CC0F0F97D10022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
 		name = "description.hpp: 24";
 		rLen = 0;
-		rLoc = 697;
+		rLoc = 671;
 		rType = 0;
-		vrLen = 2159;
+		vrLen = 2161;
 		vrLoc = 0;
 	};
-	7B3C45CD0F0F97DE0022FF52 /* PBXTextBookmark */ = {
+	7B3C45D90F0F9E100022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 29";
-		rLen = 0;
-		rLoc = 833;
+		fRef = 7BB738630EEDAF0F00931970 /* service.hpp */;
+		name = "service.hpp: 111";
+		rLen = 1;
+		rLoc = 3447;
 		rType = 0;
-		vrLen = 371;
-		vrLoc = 383;
+		vrLen = 1736;
+		vrLoc = 2704;
 	};
-	7B3C45CE0F0F97DE0022FF52 /* PBXTextBookmark */ = {
+	7B3C45DB0F0FA0A50022FF52 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 29";
+		fRef = 7BB738620EEDAF0F00931970 /* service.cpp */;
+		name = "service.cpp: 48";
 		rLen = 0;
-		rLoc = 833;
+		rLoc = 1394;
 		rType = 0;
-		vrLen = 371;
-		vrLoc = 383;
+		vrLen = 1650;
+		vrLoc = 642;
 	};
-	7B3C45CF0F0F97DE0022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 29";
-		rLen = 0;
-		rLoc = 833;
-		rType = 0;
-		vrLen = 371;
-		vrLoc = 383;
-	};
-	7B3C45D00F0F97E30022FF52 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 24";
-		rLen = 0;
-		rLoc = 671;
-		rType = 0;
-		vrLen = 2161;
-		vrLoc = 0;
-	};
-	7B4E92B20EDB05CB000F4094 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB4D72E0ED8DDC000BEAF7D /* main.cpp */;
-		name = "main.cpp: 28";
-		rLen = 0;
-		rLoc = 1975;
-		rType = 0;
-		vrLen = 886;
-		vrLoc = 0;
-	};
 	7B4E95FB0EDB4D71000F4094 /* stl_iterator.h */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.h;
@@ -2075,16 +1057,6 @@
 		vrLen = 1019;
 		vrLoc = 0;
 	};
-	7B71BB630F0933AD00D59E0A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
-		name = "description.hpp: 26";
-		rLen = 117;
-		rLoc = 1293;
-		rType = 0;
-		vrLen = 1856;
-		vrLoc = 0;
-	};
 	7B735B3B0EE4A13E004180FE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7B6DA13D0EE46ADA00C9C28A /* mainpage.h */;
@@ -2298,8 +1270,8 @@
 	};
 	7BB4D6710ED8CF8400BEAF7D /* faust.hpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {729, 920}}";
-			sepNavSelRange = "{539, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {666, 745}}";
+			sepNavSelRange = "{0, 375}";
 			sepNavVisRange = "{0, 817}";
 		};
 	};
@@ -2425,9 +1397,9 @@
 	};
 	7BB7385C0EEDAF0F00931970 /* description.hpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {688, 1134}}";
-			sepNavSelRange = "{671, 0}";
-			sepNavVisRange = "{0, 2161}";
+			sepNavIntBoundsRect = "{{0, 0}, {929, 1372}}";
+			sepNavSelRange = "{833, 0}";
+			sepNavVisRange = "{383, 372}";
 		};
 	};
 	7BB7385D0EEDAF0F00931970 /* job.cpp */ = {
@@ -2467,16 +1439,16 @@
 	};
 	7BB738620EEDAF0F00931970 /* service.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {688, 1792}}";
-			sepNavSelRange = "{1020, 0}";
-			sepNavVisRange = "{146, 1610}";
+			sepNavIntBoundsRect = "{{0, 0}, {666, 1918}}";
+			sepNavSelRange = "{1394, 0}";
+			sepNavVisRange = "{642, 1650}";
 		};
 	};
 	7BB738630EEDAF0F00931970 /* service.hpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {688, 3598}}";
-			sepNavSelRange = "{8905, 50}";
-			sepNavVisRange = "{8104, 905}";
+			sepNavIntBoundsRect = "{{0, 0}, {666, 3794}}";
+			sepNavSelRange = "{378, 0}";
+			sepNavVisRange = "{0, 1529}";
 		};
 	};
 	7BB738640EEDAF0F00931970 /* state.hpp */ = {
@@ -2526,16 +1498,6 @@
 		vrLen = 1312;
 		vrLoc = 0;
 	};
-	7BB7390D0EEDD6EF00931970 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738540EEDAEFE00931970 /* service_impl.hpp */;
-		name = "service_impl.hpp: 68";
-		rLen = 0;
-		rLoc = 408;
-		rType = 0;
-		vrLen = 1832;
-		vrLoc = 457;
-	};
 	7BB739100EEDD6EF00931970 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7BB7385C0EEDAF0F00931970 /* description.hpp */;
@@ -2556,16 +1518,6 @@
 		vrLen = 855;
 		vrLoc = 0;
 	};
-	7BB739180EEDD6EF00931970 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB738620EEDAF0F00931970 /* service.cpp */;
-		name = "service.cpp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1693;
-		vrLoc = 0;
-	};
 	7BB7391B0EEDD6EF00931970 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7BB738630EEDAF0F00931970 /* service.hpp */;
@@ -2653,16 +1605,6 @@
 		path = "/Developer/SDKs/MacOSX10.5.sdk/usr/include/c++/4.0.0/bits/stl_map.h";
 		sourceTree = "<absolute>";
 	};
-	7BC88A620EF985B4008AAF9F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB7385B0EEDAF0F00931970 /* description.cpp */;
-		name = "description.cpp: 17";
-		rLen = 0;
-		rLoc = 515;
-		rType = 0;
-		vrLen = 832;
-		vrLoc = 0;
-	};
 	7BC88A640EF985B4008AAF9F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 7B7E49EE0EF00F0E00E7E3AE /* dependency.hpp */;
@@ -2698,16 +1640,6 @@
 		state = 0;
 		symbolName = "/usr/local/include/boost-1_35/boost/shared_ptr.hpp";
 	};
-	7BC88A7B0EF98704008AAF9F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 7BB4D6B00ED8D8BE00BEAF7D /* defines.hpp */;
-		name = "defines.hpp: 20";
-		rLen = 0;
-		rLoc = 543;
-		rType = 0;
-		vrLen = 553;
-		vrLoc = 0;
-	};
 	7BC88A890EF9872E008AAF9F /* main.cpp:42 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
@@ -2745,6 +1677,53 @@
 		vrLen = 1552;
 		vrLoc = 0;
 	};
+	7BD3B27F0F18B3B700F2D971 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 7B3C451A0F0F8FC40022FF52 /* service.cpp */;
+		name = "service.cpp: 32";
+		rLen = 0;
+		rLoc = 1022;
+		rType = 0;
+		vrLen = 1619;
+		vrLoc = 0;
+	};
+	7BD3B2800F18B3B700F2D971 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 7BB738630EEDAF0F00931970 /* service.hpp */;
+		name = "service.hpp: 111";
+		rLen = 1;
+		rLoc = 3447;
+		rType = 0;
+		vrLen = 1802;
+		vrLoc = 2693;
+	};
+	7BD3B2810F18B3B700F2D971 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 7B3C451A0F0F8FC40022FF52 /* service.cpp */;
+		name = "service.cpp: 32";
+		rLen = 0;
+		rLoc = 1022;
+		rType = 0;
+		vrLen = 1619;
+		vrLoc = 0;
+	};
+	7BD3B2820F18B3B700F2D971 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 7BB738630EEDAF0F00931970 /* service.hpp */;
+		name = "service.hpp: 1";
+		rLen = 377;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1529;
+		vrLoc = 0;
+	};
+	7BD3B2880F18B94600F2D971 /* main.c */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {666, 745}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 152}";
+		};
+	};
 	7BE456D50ED9FE5C007A441F /* test */ = {
 		activeExec = 0;
 		executables = (

File [modified]: project.pbxproj
Delta lines: +10 -0
===================================================================
--- applications/FAUST/FAUST.xcodeproj/project.pbxproj	2009-01-03 13:15:28 UTC (rev 834)
+++ applications/FAUST/FAUST.xcodeproj/project.pbxproj	2009-01-10 11:10:56 UTC (rev 835)
@@ -100,6 +100,7 @@
 		7BBD4F790E9C0BFE00DD28FC /* libsaga_package_replica.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsaga_package_replica.dylib; path = "/usr/local/saga-1.0/lib/libsaga_package_replica.dylib"; sourceTree = "<absolute>"; };
 		7BBD4F7A0E9C0BFE00DD28FC /* libsaga_package_rpc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsaga_package_rpc.dylib; path = "/usr/local/saga-1.0/lib/libsaga_package_rpc.dylib"; sourceTree = "<absolute>"; };
 		7BBD4F7B0E9C0BFE00DD28FC /* libsaga_package_stream.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsaga_package_stream.dylib; path = "/usr/local/saga-1.0/lib/libsaga_package_stream.dylib"; sourceTree = "<absolute>"; };
+		7BD3B2880F18B94600F2D971 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
 		7BE456400ED9F0C4007A441F /* libboost_filesystem-mt-1_35.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libboost_filesystem-mt-1_35.dylib"; path = "/usr/local/lib/libboost_filesystem-mt-1_35.dylib"; sourceTree = "<absolute>"; };
 		7BE456410ED9F0C4007A441F /* libboost_system-mt-1_35.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libboost_system-mt-1_35.dylib"; path = "/usr/local/lib/libboost_system-mt-1_35.dylib"; sourceTree = "<absolute>"; };
 		7BE456D60ED9FE5C007A441F /* test_app */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test_app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -271,6 +272,7 @@
 			isa = PBXGroup;
 			children = (
 				7BB4D6710ED8CF8400BEAF7D /* faust.hpp */,
+				7BD3B2870F18B94600F2D971 /* agent */,
 				7B9750B80EE3573E004B4C3C /* impl */,
 				7BB4D6AD0ED8D7A400BEAF7D /* faust */,
 			);
@@ -350,6 +352,14 @@
 			name = "External Libraries";
 			sourceTree = "<group>";
 		};
+		7BD3B2870F18B94600F2D971 /* agent */ = {
+			isa = PBXGroup;
+			children = (
+				7BD3B2880F18B94600F2D971 /* main.c */,
+			);
+			path = agent;
+			sourceTree = SOURCE_ROOT;
+		};
 		7BED2ED40EE46E9E0014862C /* edu.lsu.cct.faust.docset */ = {
 			isa = PBXGroup;
 			children = (

Directory: /applications/FAUST/agent/
=====================================

File [added]: main.c
Delta lines: +17 -0
===================================================================
--- applications/FAUST/agent/main.c	2009-01-03 13:15:28 UTC (rev 834)
+++ applications/FAUST/agent/main.c	2009-01-10 11:10:56 UTC (rev 835)
@@ -0,0 +1,17 @@
+/*
+ *  main.c
+ *  FAUST - Framework for Adaptive Ubiquitous Scalable Tasks
+ *
+ *  Created by Ole Weidner <oweidner at cct.lsu.edu> on 01/10/09.
+ *  Copyright 2009 Center for Computation & Technology. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying 
+ *  LICENSE file or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+int main( int argc, char** argv )
+{
+  
+  return 0;
+}
+

Directory: /applications/FAUST/faust/faust/
===========================================

File [modified]: service.cpp
Delta lines: +2 -2
===================================================================
--- applications/FAUST/faust/faust/service.cpp	2009-01-03 13:15:28 UTC (rev 834)
+++ applications/FAUST/faust/faust/service.cpp	2009-01-10 11:10:56 UTC (rev 835)
@@ -39,7 +39,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-/*job service::create_job(description job_desc)
+job service::create_job(description job_desc)
 {
   return get_impl()->create_job(job_desc);
 }
@@ -58,7 +58,7 @@
   return get_impl()->create_job(job_desc, job_obj, dep);
 }
 
-////////////////////////////////////////////////////////////////////////////////
+/*////////////////////////////////////////////////////////////////////////////////
 //
 job service::create_job(description job_desc, job_group job_group_obj, dependency dep)
 {



More information about the saga-devel mailing list