diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-03-19 10:49:01 -0300 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-03-19 10:49:01 -0300 |
| commit | e46eb6daa7acdb19f1b334a403a391cbc12b417c (patch) | |
| tree | b1a8a1a6608eaf53adbf9a7aa327990fb7281b62 /cpp | |
| parent | Remove extra IF in vsaddin (diff) | |
| download | ice-e46eb6daa7acdb19f1b334a403a391cbc12b417c.tar.bz2 ice-e46eb6daa7acdb19f1b334a403a391cbc12b417c.tar.xz ice-e46eb6daa7acdb19f1b334a403a391cbc12b417c.zip | |
Added Ice for C# support for SOCKS proxies
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/ConfluenceOutput.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 40c25e8807e..2bc22807c11 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Feb 7 14:51:12 2013 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Mar 19 08:07:05 2013 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -110,6 +110,8 @@ const IceInternal::Property IcePropsData[] = IceInternal::Property("Ice.ProgramName", false, 0), IceInternal::Property("Ice.RetryIntervals", false, 0), IceInternal::Property("Ice.ServerIdleTime", false, 0), + IceInternal::Property("Ice.SOCKSProxyHost", false, 0), + IceInternal::Property("Ice.SOCKSProxyPort", false, 0), IceInternal::Property("Ice.StdErr", false, 0), IceInternal::Property("Ice.StdOut", false, 0), IceInternal::Property("Ice.SyslogFacility", false, 0), diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 7d256656f9c..d25341799bf 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Feb 7 14:51:12 2013 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Mar 19 08:07:05 2013 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp index 88861018728..ad62c1f0c25 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.cpp +++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp @@ -786,7 +786,7 @@ Confluence::ConfluenceOutput::getMarkerLimits(const string& str) end = str.find(TEMP_ESCAPER_END, start+TEMP_ESCAPER_START.size()); if(end != string::npos) { - pair<unsigned int, unsigned int> p = make_pair((unsigned int)start, (unsigned int)end+TEMP_ESCAPER_END.size()); + pair<unsigned int, unsigned int> p = make_pair(static_cast<unsigned int>(start), static_cast<unsigned int>(end+TEMP_ESCAPER_END.size())); pairs.push_back(p); start = str.find(TEMP_ESCAPER_START, end+TEMP_ESCAPER_END.size()); } |