diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-14 22:55:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-17 11:06:51 +0100 |
| commit | 30f3b36e07ce37a3fe1909fb4b1419a00d2fdd81 (patch) | |
| tree | 1542b4e983865c64a39411fa3212826cae716d8b | |
| parent | b3e5b5941f06dab1818e77b12ff0243eecf24601 (diff) | |
sal: remove pointless checking for __cplusplus in public C++ headers
Change-Id: Ibbcdb4a3f46b7491396a1b1c7b4cdc1af05f30d3
| -rw-r--r-- | include/osl/conditn.hxx | 3 | ||||
| -rw-r--r-- | include/osl/mutex.hxx | 3 | ||||
| -rw-r--r-- | include/rtl/strbuf.hxx | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx index fd0dfdfb303d..9485e7f41aed 100644 --- a/include/osl/conditn.hxx +++ b/include/osl/conditn.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_OSL_CONDITN_HXX #define INCLUDED_OSL_CONDITN_HXX -#ifdef __cplusplus - #include <osl/time.h> #include <osl/conditn.h> @@ -122,7 +120,6 @@ namespace osl } -#endif /* __cplusplus */ #endif // INCLUDED_OSL_CONDITN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx index 17d57e80b473..99241eb8b135 100644 --- a/include/osl/mutex.hxx +++ b/include/osl/mutex.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_OSL_MUTEX_HXX #define INCLUDED_OSL_MUTEX_HXX -#ifdef __cplusplus - #include <osl/mutex.h> @@ -240,7 +238,6 @@ namespace osl typedef ResettableGuard< Mutex > ResettableMutexGuard; } -#endif /* __cplusplus */ #endif // INCLUDED_OSL_MUTEX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx index 1bfe640e3587..c089d61d48ad 100644 --- a/include/rtl/strbuf.hxx +++ b/include/rtl/strbuf.hxx @@ -33,8 +33,6 @@ #include <rtl/stringconcat.hxx> #endif -#ifdef __cplusplus - // The unittest uses slightly different code to help check that the proper // calls are made. The class is put into a different namespace to make // sure the compiler generates a different (if generating also non-inline) @@ -974,7 +972,6 @@ typedef rtlunittest::OStringBuffer OStringBuffer; using ::rtl::OStringBuffer; #endif -#endif /* __cplusplus */ #endif // INCLUDED_RTL_STRBUF_HXX |