[Libreoffice-commits] core.git: bin/gen-iwyu-dummy-lib include/store store/source

[Noel Grandin]

 bin/gen-iwyu-dummy-lib    |    2 +-
 include/store/store.h     |    4 +++-
 include/store/store.hxx   |    4 +++-
 include/store/types.h     |    1 -
 store/source/stordata.hxx |    1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit aed0a639f4af8e630dbd6bd4f2e0368b1481eae3
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Sep 16 13:07:48 2015 +0200

    tdf#42949 remove unnecessary includes using iwyu
    
    Change-Id: I13960721b7e15b1761aff8497391e39ae5645b89
    Reviewed-on: https://gerrit.libreoffice.org/18616
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/bin/gen-iwyu-dummy-lib b/bin/gen-iwyu-dummy-lib
index 62e7c7b..92ec408 100755
--- a/bin/gen-iwyu-dummy-lib
+++ b/bin/gen-iwyu-dummy-lib
@@ -62,7 +62,7 @@ for dir in $(echo ${iwyu_INCLUDEDIRS_EXTRA} | sed -e "s/ /\n/g" | uniq) ${iwyu_I
     echo "-I${SRCDIR}/${dir} \\";
 done >> ${iwyu_LIB}
 # it fails to find stddef.h?
-echo '-I/usr/lib/clang/3.4/include \' >> ${iwyu_LIB}
+echo '-I/usr/lib/clang/3.6/include \' >> ${iwyu_LIB}
 echo "))" >> ${iwyu_LIB} >> ${iwyu_LIB}
 
 echo '$(eval $(call gb_StaticLibrary__add_iwyu_headers,iwyudummy,\' >> ${iwyu_LIB}
diff --git a/include/store/store.h b/include/store/store.h
index 48852c7..1b48a13 100644
--- a/include/store/store.h
+++ b/include/store/store.h
@@ -20,8 +20,10 @@
 #ifndef INCLUDED_STORE_STORE_H
 #define INCLUDED_STORE_STORE_H
 
-#include <store/types.h>
 #include <store/storedllapi.h>
+#include <store/types.h>
+#include "rtl/ustring.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/store/store.hxx b/include/store/store.hxx
index d9edcf3..7a9d355 100644
--- a/include/store/store.hxx
+++ b/include/store/store.hxx
@@ -20,9 +20,11 @@
 #ifndef INCLUDED_STORE_STORE_HXX
 #define INCLUDED_STORE_STORE_HXX
 
+#include <store/store.h>
 #include <sal/types.h>
+#include <stddef.h>
 #include <rtl/ustring.hxx>
-#include <store/store.h>
+#include "types.h"
 
 namespace store
 {
diff --git a/include/store/types.h b/include/store/types.h
index dd4fafc..b3b9ad5 100644
--- a/include/store/types.h
+++ b/include/store/types.h
@@ -21,7 +21,6 @@
 #define INCLUDED_STORE_TYPES_H
 
 #include <sal/types.h>
-#include <rtl/ustring.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index e53a9b6..ca116bb 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -24,6 +24,7 @@
 
 #include "sal/types.h"
 #include "sal/macros.h"
+#include "rtl/string.h"
 
 #include "store/types.h"
 #include "storbase.hxx"