diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-02-14 16:22:39 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-02-14 16:22:39 +0800 |
| commit | 294ec25fda6e3785c54970d274b860b1ca837955 (patch) | |
| tree | 26e5d1987ffdfde7bbacb87fdfb7b96bbef998e9 /cpp/src/slice2freezej/Main.cpp | |
| parent | Merge branch 'bug2435' (diff) | |
| download | ice-294ec25fda6e3785c54970d274b860b1ca837955.tar.bz2 ice-294ec25fda6e3785c54970d274b860b1ca837955.tar.xz ice-294ec25fda6e3785c54970d274b860b1ca837955.zip | |
merged bug2615
Diffstat (limited to 'cpp/src/slice2freezej/Main.cpp')
| -rw-r--r-- | cpp/src/slice2freezej/Main.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index 4494fe94e0e..f8c51ab112b 100644 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -254,11 +254,16 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) return false; } - if(!Dictionary::legalKeyType(valueType)) + bool containsSequence = false; + if(!Dictionary::legalKeyType(valueType, containsSequence)) { cerr << _prog << ": `" << dict.value << "' is not a valid index type" << endl; return false; } + if(containsSequence) + { + cerr << _prog << ": warning: use of sequences in dictionary keys has been deprecated" << endl; + } if(index.caseSensitive == false) { @@ -320,11 +325,16 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) TypePtr dataMemberType = dataMember->type(); - if(!Dictionary::legalKeyType(dataMemberType)) + bool containsSequence = false; + if(!Dictionary::legalKeyType(dataMemberType, containsSequence)) { cerr << _prog << ": `" << index.member << "' cannot be used as an index" << endl; return false; } + if(containsSequence) + { + cerr << _prog << ": warning: use of sequences in dictionary keys has been deprecated" << endl; + } if(index.caseSensitive == false) { |