diff options
author | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-09-01 12:32:07 +0200 |
---|---|---|
committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-09-01 12:32:07 +0200 |
commit | 579fda569ddfa62b27e417f1fe7c2c64c292d49c (patch) | |
tree | 3bf386129cb6edc9bc9ad806556457084e89b051 /gcc/ada/a-direct.adb | |
parent | c49eacd5445f8a46b015995b9834f9c2b13b38c3 (diff) | |
download | gcc-579fda569ddfa62b27e417f1fe7c2c64c292d49c.zip gcc-579fda569ddfa62b27e417f1fe7c2c64c292d49c.tar.gz gcc-579fda569ddfa62b27e417f1fe7c2c64c292d49c.tar.bz2 |
[multiple changes]
2011-09-01 Hristian Kirtchev <kirtchev@adacore.com>
* exp_strm.adb: Remove with and use clause for Opt.
(Build_Array_Input_Function): Remove the version-dependent generation
of the return statement. The Ada 2005 tree is now the default.
2011-09-01 Yannick Moy <moy@adacore.com>
* put_alfa.adb: Unconditionnally write files in Alfa section, so that
it is never empty when compiling in Alfa mode.
2011-09-01 Robert Dewar <dewar@adacore.com>
* sem_aggr.adb, sem_ch3.adb, a-direct.adb, s-taprop-vxworks.adb,
comperr.adb, exp_ch9.adb, exp_pakd.adb, sem_ch12.adb, freeze.adb,
s-taprop-mingw.adb, s-taprop-linux.adb, s-taprop-solaris.adb,
gnat1drv.adb, a-rbtgbo.adb, exp_dist.adb: Minor reformatting
2011-09-01 Matthew Heaney <heaney@adacore.com>
* Makefile.rtl, impunit.adb: Add a-csquin.ads, a-cusyqu.ad[sb],
a-cuprqu.ad[sb], a-cbsyqu.ad[sb], a-cbprqu.ad[sb]
* a-csquin.ads: New Ada 2012 unit that specifies the queue interface
* a-cusyqu.ads, a-cusyqu.adb: New Ada 2012 unit that specifies the
unbounded queue container.
* a-cbsyqu.ads, a-cbsyqu.adb: New Ada 2012 unit that specifies the
bounded queue container.
* a-cuprqu.ads, a-cuprqu.adb: New Ada 2012 unit that specifies the
unbounded priority queue container.
* a-cbprqu.ads, a-cbprqu.adb: New Ada 2012 unit that specifies the
bounded priority queue container.
From-SVN: r178398
Diffstat (limited to 'gcc/ada/a-direct.adb')
-rw-r--r-- | gcc/ada/a-direct.adb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/ada/a-direct.adb b/gcc/ada/a-direct.adb index 3050b14..e27bb3f 100644 --- a/gcc/ada/a-direct.adb +++ b/gcc/ada/a-direct.adb @@ -32,7 +32,7 @@ with Ada.Calendar; use Ada.Calendar; with Ada.Calendar.Formatting; use Ada.Calendar.Formatting; with Ada.Directories.Validity; use Ada.Directories.Validity; -with Ada.Strings.Maps; use Ada; use Ada.Strings.Maps; +with Ada.Strings.Maps; use Ada.Strings.Maps; with Ada.Strings.Fixed; with Ada.Strings.Unbounded; use Ada.Strings.Unbounded; with Ada.Unchecked_Conversion; @@ -451,14 +451,15 @@ package body Ada.Directories is New_Dir (1 .. New_Directory'Length) := New_Directory; New_Dir (New_Dir'Last) := Directory_Separator; + -- If host is windows, and the first two characters are directory + -- separators, we have an UNC path. Skip it. + if Directory_Separator = '\' and then New_Dir'Length > 2 and then Is_In (New_Dir (1), Dir_Seps) and then Is_In (New_Dir (2), Dir_Seps) then Start := 2; - -- If the first two characters are directory separators and host - -- is windows, we have an UNC path. Skip it. loop Start := Start + 1; exit when Start = New_Dir'Last |