diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:37:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:37:31 +0000 |
| commit | 470fe190f98aa852d5aee91c9f6a130ec2bdc29a (patch) | |
| tree | d21c2a5b5e670510d3784df4a769f75ba492680a /ucb | |
| parent | c78b34a4fb3bd1ebf1f678e3ed9e4e1984d5c27c (diff) | |
INTEGRATION: CWS warnings01 (1.14.10); FILE MERGED
2005/11/10 18:10:29 pl 1.14.10.2: #i55991# removed warnings
2005/11/10 17:15:28 pl 1.14.10.1: #i55991# removed warnings
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/webdav/NeonUri.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx index 9f1bea90936c..23a522c20b56 100644 --- a/ucb/source/ucp/webdav/NeonUri.cxx +++ b/ucb/source/ucp/webdav/NeonUri.cxx @@ -4,9 +4,9 @@ * * $RCSfile: NeonUri.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-09 16:13:50 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:37:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -54,9 +54,17 @@ using namespace webdav_ucp; -ne_uri NeonUri::sUriDefaultsHTTP = { "http", NULL, DEFAULT_HTTP_PORT, NULL }; -ne_uri NeonUri::sUriDefaultsHTTPS = { "https", NULL, DEFAULT_HTTPS_PORT, NULL }; -ne_uri NeonUri::sUriDefaultsFTP = { "ftp", NULL, DEFAULT_FTP_PORT, NULL }; +# if defined __SUNPRO_CC +// FIXME: not sure whether initializing a ne_uri statically is supposed to work +// the string fields of ne_uri are char*, not const char* +# pragma disable_warn +# endif +ne_uri NeonUri::sUriDefaultsHTTP = { "http", NULL, DEFAULT_HTTP_PORT, NULL, NULL }; +ne_uri NeonUri::sUriDefaultsHTTPS = { "https", NULL, DEFAULT_HTTPS_PORT, NULL, NULL }; +ne_uri NeonUri::sUriDefaultsFTP = { "ftp", NULL, DEFAULT_FTP_PORT, NULL, NULL }; +# if defined __SUNPRO_CC +# pragma enable_warn +#endif // ------------------------------------------------------------------- // Constructor |