From 9181312304a578be6837071e30ed56421a66b96d Mon Sep 17 00:00:00 2001
From: Masaki Muranaka <monamour@monaka.org>
Date: Mon, 23 May 2011 12:45:13 +0900
Subject: [PATCH] (fix #1)
---
toppers/oil/factory.cpp | 4 ++--
toppers/oil/oil_object.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/toppers/oil/factory.cpp b/toppers/oil/factory.cpp
index 826f0db..6c7bcd8 100644
a
|
b
|
namespace toppers
|
61 | 61 | |
62 | 62 | object_definition* find_object(string name , cfg1_out::cfg_obj_map const& obj_def_map) |
63 | 63 | { |
64 | | std::map< std::string, std::vector<object_definition*>>::const_iterator p; |
| 64 | std::map< std::string, std::vector<object_definition*> >::const_iterator p; |
65 | 65 | std::vector<object_definition*>::const_iterator q; |
66 | 66 | |
67 | 67 | // ¼Oªêv·éIuWFNgðõ |
… |
… |
namespace toppers
|
87 | 87 | std::map< std::string, long > id_map; |
88 | 88 | |
89 | 89 | using namespace toppers::oil::oil_definition; |
90 | | std::map< std::string, std::vector<object_definition*>>::const_iterator p; |
| 90 | std::map< std::string, std::vector<object_definition*> >::const_iterator p; |
91 | 91 | std::vector<object_definition*>::const_iterator q; |
92 | 92 | std::vector<object_parameter_def*>::const_iterator r; |
93 | 93 | |
diff --git a/toppers/oil/oil_object.cpp b/toppers/oil/oil_object.cpp
index 8874ece..8472765 100644
a
|
b
|
namespace toppers
|
801 | 801 | using namespace toppers; |
802 | 802 | using namespace toppers::oil::oil_definition; |
803 | 803 | |
804 | | std::map<std::string, std::vector< object_definition* >>::iterator p; |
| 804 | std::map< std::string, std::vector< object_definition* > >::iterator p; |
805 | 805 | std::vector<object_definition*>::iterator q; |
806 | 806 | int serial; |
807 | 807 | |
… |
… |
namespace toppers
|
862 | 862 | temp = merge(sub_objects , temp , subparam_name , s , id); |
863 | 863 | |
864 | 864 | // ÊðRs[(¿å¤Ç¢¢\bhª³¢) |
865 | | std::map< std::string, std::vector< object_definition* >>::iterator x; |
| 865 | std::map< std::string, std::vector< object_definition* > >::iterator x; |
866 | 866 | for(x = temp.begin() ; x != temp.end() ; x++ ) |
867 | 867 | { |
868 | 868 | std::vector< object_definition* >::iterator y; |