diff options
| author | David Tardon <dtardon@redhat.com> | 2012-02-29 13:04:49 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-01 15:51:31 +0100 |
| commit | b60cf256b76cd12601b6e243f084dcc25bea172e (patch) | |
| tree | ace918ae880ce29e9206ef36b964651c2b79c983 /framework | |
| parent | a5c891f59e7dfd81281b8bcc1b54c03f4e395203 (diff) | |
do not include external stuff into namespace
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/fwi/helper/networkdomain.cxx | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx index 22066c6aee68..818cd94b2fa3 100644 --- a/framework/source/fwi/helper/networkdomain.cxx +++ b/framework/source/fwi/helper/networkdomain.cxx @@ -28,9 +28,6 @@ #include <helper/networkdomain.hxx> -namespace framework -{ - #ifdef WNT //_________________________________________________________________________________________________________________ // Windows @@ -67,6 +64,9 @@ static rtl::OUString GetUserDomain() // Windows //_________________________________________________________________________________________________________________ +namespace framework +{ + rtl::OUString NetworkDomain::GetYPDomainName() { return ::rtl::OUString(); @@ -77,6 +77,8 @@ rtl::OUString NetworkDomain::GetNTDomainName() return GetUserDomain(); } +} + #elif defined( UNIX ) #include <rtl/ustring.h> @@ -192,6 +194,9 @@ static rtl_uString *getDomainName() // Unix //_________________________________________________________________________________________________________________ +namespace framework +{ + rtl::OUString NetworkDomain::GetYPDomainName() { rtl_uString* pResult = getDomainName(); @@ -206,12 +211,17 @@ rtl::OUString NetworkDomain::GetNTDomainName() return ::rtl::OUString(); } +} + #else /* UNIX */ //_________________________________________________________________________________________________________________ // Other operating systems (non-Windows and non-Unix) //_________________________________________________________________________________________________________________ +namespace framework +{ + rtl::OUString NetworkDomain::GetYPDomainName() { return rtl::OUString(); @@ -222,8 +232,8 @@ rtl::OUString NetworkDomain::GetNTDomainName() return rtl::OUString(); } -#endif +} -} // namespace framework +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |