• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1949 (tree)
日時2011-05-06 16:18:01
作者satofumi

ログメッセージ

fixed size_t error

変更サマリ

差分

--- trunk/libs/running/PhidgetDevice.cpp (revision 1948)
+++ trunk/libs/running/PhidgetDevice.cpp (revision 1949)
@@ -10,6 +10,7 @@
1010 #include "PhidgetDevice.h"
1111 #include <phidget21.h>
1212 #include <string>
13+#include <cstdio>
1314
1415 using namespace qrk;
1516 using namespace std;
--- trunk/libs/running/PacketAccess.cpp (revision 1948)
+++ trunk/libs/running/PacketAccess.cpp (revision 1949)
@@ -1,4 +1,5 @@
11 #include "PacketAccess.h"
2+#include <cstddef>
23
34
45 namespace
--- trunk/libs/range_finder/RangeFinder.h (revision 1948)
+++ trunk/libs/range_finder/RangeFinder.h (revision 1949)
@@ -12,6 +12,7 @@
1212
1313 #include "MathUtils.h"
1414 #include <vector>
15+#include <cstddef>
1516
1617
1718 namespace qrk
--- trunk/libs/system/CycleTimer.h (revision 1948)
+++ trunk/libs/system/CycleTimer.h (revision 1949)
@@ -11,6 +11,7 @@
1111 */
1212
1313 #include <memory>
14+#include <cstdio>
1415
1516
1617 namespace qrk
--- trunk/libs/system/LockGuard.h (revision 1948)
+++ trunk/libs/system/LockGuard.h (revision 1949)
@@ -11,6 +11,7 @@
1111 */
1212
1313 #include <memory>
14+#include <cstddef>
1415
1516
1617 namespace qrk
--- trunk/libs/system/BatteryState.h (revision 1948)
+++ trunk/libs/system/BatteryState.h (revision 1949)
@@ -11,6 +11,7 @@
1111 */
1212
1313 #include <memory>
14+#include <cstddef>
1415
1516
1617 namespace qrk
--- trunk/libs/system/Semaphore.h (revision 1948)
+++ trunk/libs/system/Semaphore.h (revision 1949)
@@ -13,6 +13,7 @@
1313 */
1414
1515 #include <memory>
16+#include <cstddef>
1617
1718
1819 namespace qrk
--- trunk/libs/gui/Screen.cpp (revision 1948)
+++ trunk/libs/gui/Screen.cpp (revision 1949)
@@ -59,7 +59,7 @@
5959 SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, rgb_size[2]);
6060 SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
6161 SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
62- SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
62+ //SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
6363 }
6464
6565
--- trunk/libs/gui/Makefile (revision 1948)
+++ trunk/libs/gui/Makefile (revision 1949)
@@ -57,6 +57,7 @@
5757 CallbackEvent.o: Event.h ../geometry/Point.h ../geometry/Rect.h
5858 CanvasSurface.o: Surface.h ../geometry/Rect.h ../geometry/Point.h
5959 CanvasSurface.o: ../common/Color.h
60+ChangeSelect.o: Component.h ../geometry/Rect.h ../geometry/Point.h
6061 ChatMessage.o: Component.h ../geometry/Rect.h ../geometry/Point.h
6162 CheckBox.o: Component.h ../geometry/Rect.h ../geometry/Point.h
6263 ColorSurface.o: Surface.h ../geometry/Rect.h
@@ -73,6 +74,7 @@
7374 MultiSurface.o: Surface.h ../geometry/Rect.h ../geometry/Point.h
7475 SDL_GL_Texture.o: ../geometry/Rect.h
7576 Screen.o: ../geometry/Rect.h
77+SlideSelect.o: Component.h ../geometry/Rect.h ../geometry/Point.h
7678 Surface.o: ../geometry/Rect.h
7779 SwitchSurface.o: Surface.h ../geometry/Rect.h
7880 TextFadeSurface.o: Surface.h ../geometry/Rect.h
@@ -88,6 +90,8 @@
8890 CallbackEvent.o: ../geometry/Rect.h ../geometry/RectUtils.h
8991 CanvasSurface.o: CanvasSurface.h Surface.h ../geometry/Rect.h
9092 CanvasSurface.o: ../geometry/Point.h ../common/Color.h Font.h TextSurface.h
93+ChangeSelect.o: ChangeSelect.h Component.h ../geometry/Rect.h
94+ChangeSelect.o: ../geometry/Point.h
9195 ChatMessage.o: ChatMessage.h Component.h ../geometry/Rect.h
9296 ChatMessage.o: ../geometry/Point.h Font.h ../common/Color.h TextSurface.h
9397 ChatMessage.o: Surface.h ../system/StopWatch.h
@@ -121,6 +125,8 @@
121125 Screen.o: Screen.h ../geometry/Rect.h SdlVideoInit.h ../common/Color.h
122126 SdlTtfInit.o: ../system/sdl/SdlInit.h SdlTtfInit.h
123127 SdlVideoInit.o: SdlVideoInit.h ../system/sdl/SdlInit.h
128+SlideSelect.o: SlideSelect.h Component.h ../geometry/Rect.h
129+SlideSelect.o: ../geometry/Point.h
124130 SwitchSurface.o: SwitchSurface.h Surface.h ../geometry/Rect.h
125131 TextFadeSurface.o: TextFadeSurface.h Surface.h ../geometry/Rect.h
126132 TextFadeSurface.o: TextSurface.h ../input/Utf8.h
--- trunk/libs/gui/samples/Makefile (revision 1948)
+++ trunk/libs/gui/samples/Makefile (revision 1949)
@@ -78,6 +78,12 @@
7878 handleEvent.o: ../Screen.h ../../geometry/Rect.h ../CallbackEvent.h
7979 handleEvent.o: ../Event.h ../../geometry/Point.h ../LayerManager.h
8080 handleEvent.o: ../LayerInterface.h ../../system/delay.h
81+horizontalMenu.o: ../Menu.h ../Component.h ../../geometry/Rect.h
82+horizontalMenu.o: ../../geometry/Point.h ../Screen.h ../LayerManager.h
83+horizontalMenu.o: ../LayerInterface.h ../Layer.h ../Font.h
84+horizontalMenu.o: ../../common/Color.h ../TextSurface.h ../Surface.h
85+horizontalMenu.o: ../Button.h ../CallbackEvent.h ../Event.h ../EventUtils.h
86+horizontalMenu.o: ../../system/delay.h
8187 inputDraw.o: ../Font.h ../../common/Color.h ../Screen.h ../../geometry/Rect.h
8288 inputDraw.o: ../LayerManager.h ../LayerInterface.h ../../geometry/Point.h
8389 inputDraw.o: ../Layer.h ../TextSurface.h ../Surface.h ../Label.h
--- trunk/libs/monitor/system/LockGuard.h (revision 1948)
+++ trunk/libs/monitor/system/LockGuard.h (revision 1949)
@@ -11,6 +11,7 @@
1111 */
1212
1313 #include <memory>
14+#include <cstddef>
1415
1516
1617 namespace qrk
--- trunk/libs/monitor/system/Semaphore.h (revision 1948)
+++ trunk/libs/monitor/system/Semaphore.h (revision 1949)
@@ -13,6 +13,7 @@
1313 */
1414
1515 #include <memory>
16+#include <cstddef>
1617
1718
1819 namespace qrk
--- trunk/libs/monitor/system/Lock.h (revision 1948)
+++ trunk/libs/monitor/system/Lock.h (revision 1949)
@@ -11,6 +11,7 @@
1111 */
1212
1313 #include "ConditionVariable.h"
14+#include <cstddef>
1415
1516
1617 namespace qrk
@@ -26,7 +27,7 @@
2627 Lock(const Lock& rhs);
2728 Lock& operator = (const Lock& rhs);
2829
29- // !!! ?
30+ // !!!
3031 void* operator new (size_t);
3132 void* operator new[] (size_t);
3233
--- trunk/libs/path/SearchPath.h (revision 1948)
+++ trunk/libs/path/SearchPath.h (revision 1949)
@@ -13,6 +13,7 @@
1313 #include "Point.h"
1414 #include <vector>
1515 #include <memory>
16+#include <cstddef>
1617
1718
1819 namespace qrk
--- trunk/libs/connection/c/Makefile (revision 1948)
+++ trunk/libs/connection/c/Makefile (revision 1949)
@@ -40,12 +40,4 @@
4040 serial_t_lin.o: ../../common/c/ring_buffer.h
4141 serial_t_win.o: ../../common/c/ring_buffer.h
4242 serial_utils.o: serial_t.h ../../system/c/detect_os.h serial_t_lin.h
43-serial_utils.o: ../../common/c/ring_buffer.h
44-serial_ctrl.o: serial_ctrl.h serial_t.h ../../system/c/detect_os.h
45-serial_ctrl.o: serial_t_lin.h ../../common/c/ring_buffer.h serial_ctrl_lin.c
46-serial_ctrl.o: serial_errno.h
47-serial_ctrl_lin.o: serial_errno.h ../../common/c/ring_buffer.h
48-serial_ctrl_win.o: serial_ctrl.h serial_t.h ../../system/c/detect_os.h
49-serial_ctrl_win.o: serial_t_lin.h ../../common/c/ring_buffer.h serial_errno.h
50-serial_utils.o: serial_utils.h serial_t.h ../../system/c/detect_os.h
51-serial_utils.o: serial_t_lin.h ../../common/c/ring_buffer.h serial_ctrl.h
43+serial_utils.o: ../../common/c/ring_buffer.h
\ No newline at end of file
--- trunk/libs/audio/SoundEffect.h (revision 1948)
+++ trunk/libs/audio/SoundEffect.h (revision 1949)
@@ -11,6 +11,7 @@
1111 */
1212
1313 #include <memory>
14+#include <cstddef>
1415
1516
1617 namespace qrk
--- trunk/libs/positioning/FeaturePointMap.cpp (revision 1948)
+++ trunk/libs/positioning/FeaturePointMap.cpp (revision 1949)
@@ -145,8 +145,6 @@
145145 {
146146 (void)sensor_position;
147147
148- bool added = false;
149-
150148 size_t buffer_index = 0;
151149 long first_timestamp = buffers_.front()->timestamp;
152150 long last_timestamp = buffers_.back()->timestamp;
@@ -171,7 +169,6 @@
171169 buffers_.push_front(buffer);
172170 buffer_index = 0;
173171
174- added = true;
175172 } else {
176173 // 既に存在するバッファから、位置を検索
177174 while ((buffer_index < buffers_.size()) &&
--- trunk/libs/positioning/ObjectMapBuffer.h (revision 1948)
+++ trunk/libs/positioning/ObjectMapBuffer.h (revision 1949)
@@ -13,6 +13,7 @@
1313 */
1414
1515 #include <memory>
16+#include <cstddef>
1617
1718
1819 namespace qrk
--- trunk/libs/positioning/PointMap.h (revision 1948)
+++ trunk/libs/positioning/PointMap.h (revision 1949)
@@ -13,6 +13,7 @@
1313 #include "Point.h"
1414 #include <vector>
1515 #include <memory>
16+#include <cstddef>
1617
1718
1819 namespace qrk
--- trunk/libs/packages/urg_c_simple/Makefile (revision 1948)
+++ trunk/libs/packages/urg_c_simple/Makefile (revision 1949)
@@ -60,6 +60,9 @@
6060 gd_scan.o: urg_ctrl.h urg_t.h urg_parameter_t.h serial_t.h detect_os.h
6161 gd_scan.o: serial_t_lin.h ring_buffer.h
6262 ring_buffer.o: ring_buffer.h
63+scip_handler.o: scip_handler.h urg_parameter_t.h serial_t.h detect_os.h
64+scip_handler.o: serial_t_lin.h ring_buffer.h serial_errno.h serial_ctrl.h
65+scip_handler.o: serial_utils.h urg_errno.h
6366 serial_ctrl.o: serial_ctrl.h serial_t.h detect_os.h serial_t_lin.h
6467 serial_ctrl.o: ring_buffer.h serial_ctrl_lin.c serial_errno.h
6568 serial_ctrl_lin.o: serial_errno.h ring_buffer.h
旧リポジトリブラウザで表示