[openrtm-commit:01677] r2693 - branches/RELENG_1_1/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-01-14 11:19:54 +0900 (Thu, 14 Jan 2016)
New Revision: 2693

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/configure.ac
Log:
[merge] r2681 has been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605,2610,2626,2648,2652-2653,2670,2677-2678,2682,2684-2687
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605,2610,2626,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687

Modified: branches/RELENG_1_1/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/configure.ac	2016-01-13 06:35:17 UTC (rev 2692)
+++ branches/RELENG_1_1/OpenRTM-aist/configure.ac	2016-01-14 02:19:54 UTC (rev 2693)
@@ -1045,7 +1045,7 @@
 	PATH_NORM($omniidl)
 	omniidl=$n_path
 	IDLC=$omniidl
-	IDL_FLAGS="-bcxx -Wba -nf"
+	IDL_FLAGS="-bcxx -Wba -nf -Wbuse_quotes"
 
 	dnl omniNames
 	PATH_NORM($omniNames)


Property changes on: branches/RELENG_1_1/OpenRTM-aist/configure.ac
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409,2548-2555,2605,2677-2678
   + /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409,2548-2555,2605,2677-2678,2681