• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1975 (tree)
日時2012-02-17 10:44:20
作者satofumi

ログメッセージ

added extern C to urg_ctrl.h

変更サマリ

差分

--- trunk/libs/system/c/urg_ticks.h (revision 1974)
+++ trunk/libs/system/c/urg_ticks.h (revision 1975)
@@ -10,7 +10,11 @@
1010 $Id$
1111 */
1212
13+#ifdef __cplusplus
14+extern "C" {
15+#endif
1316
17+
1418 /*!
1519 \brief タイムスタンプの取得
1620
@@ -18,4 +22,8 @@
1822 */
1923 extern long urg_ticks(void);
2024
25+#ifdef __cplusplus
26+}
27+#endif
28+
2129 #endif /* !QRK_C_TICKS_H */
--- trunk/libs/system/c/urg_delay.h (revision 1974)
+++ trunk/libs/system/c/urg_delay.h (revision 1975)
@@ -10,7 +10,11 @@
1010 $Id$
1111 */
1212
13+#ifdef __cplusplus
14+extern "C" {
15+#endif
1316
17+
1418 /*!
1519 \brief 待機
1620
@@ -20,4 +24,8 @@
2024 */
2125 void urg_delay(int msec);
2226
27+#ifdef __cplusplus
28+}
29+#endif
30+
2331 #endif /* !QRK_C_DELAY_H */
--- trunk/libs/range_sensor/c/urg_ctrl.h (revision 1974)
+++ trunk/libs/range_sensor/c/urg_ctrl.h (revision 1975)
@@ -12,6 +12,10 @@
1212 \todo Define examples for each functions
1313 */
1414
15+#ifdef __cplusplus
16+extern "C" {
17+#endif
18+
1519 #include "urg_t.h"
1620
1721
@@ -620,4 +624,8 @@
620624 */
621625 extern long urg_currentTimestamp(urg_t *urg);
622626
627+#ifdef __cplusplus
628+}
629+#endif
630+
623631 #endif /* !QRK_C_URG_CTRL_H */
--- trunk/libs/range_sensor/UrgDevice.cpp (revision 1974)
+++ trunk/libs/range_sensor/UrgDevice.cpp (revision 1975)
@@ -645,7 +645,7 @@
645645
646646 bool setTimestamp(int timestamp, int* response_msec, int* force_delay_msec)
647647 {
648- long prepare_ticks = ticks();
648+ long prepare_ticks = ticks();
649649
650650 // TM0 モードに遷移
651651 // !!! true, false をキーワードで置換すること
@@ -658,7 +658,7 @@
658658 int first_ticks = ticks();
659659 if (scip_.rawTimestamp(&urg_timestamp)) {
660660
661- //fprintf(stderr, "raw: %d, %d\n", timestamp, urg_timestamp);
661+ //fprintf(stderr, "raw: %d, %d\n", timestamp, urg_timestamp);
662662
663663 int delay = ticks() - first_ticks;
664664 if (force_delay_msec) {
--- trunk/libs/geometry/Angle.cpp (revision 1974)
+++ trunk/libs/geometry/Angle.cpp (revision 1975)
@@ -118,4 +118,3 @@
118118 {
119119 return Angle(rhs) * lhs;
120120 }
121-
--- trunk/libs/connection/qt/TcpipSocket.cpp (revision 1974)
+++ trunk/libs/connection/qt/TcpipSocket.cpp (revision 1975)
@@ -70,8 +70,10 @@
7070
7171 void TcpipSocket::disconnect(void)
7272 {
73- pimpl->socket_->disconnectFromHost();
74- pimpl->socket_->waitForDisconnected();
73+ if (pimpl->socket_->isValid()) {
74+ pimpl->socket_->disconnectFromHost();
75+ pimpl->socket_->waitForDisconnected();
76+ }
7577 }
7678
7779
--- trunk/libs/packages/urg/document/Makefile (revision 1974)
+++ trunk/libs/packages/urg/document/Makefile (revision 1975)
@@ -4,6 +4,7 @@
44 doxygen Doxyfile_c
55 zip -r document_c_html.zip document_c_html
66 # doxygen Doxyfile_cpp
7+# zip -r document_cpp_html.zip document_cpp_html
78
89 clean :
9- $(RM) -rf document_c_html
10+ $(RM) -rf document_c_html document_cpp_html
旧リポジトリブラウザで表示