IWYU in ogrsf_frmts/mem

git-svn-id: https://svn.osgeo.org/gdal/trunk@41516 f0d54148-0727-0410-94bb-9a71ac55c965
xeyler · Feb 16, 2018 · 7b2fe2b · 7b2fe2b
1 parent c9d7f77
commit 7b2fe2b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/gdal/ogr/ogrsf_frmts/mem/ogrmemdatasource.cpp b/gdal/ogr/ogrsf_frmts/mem/ogrmemdatasource.cpp
@@ -26,9 +26,14 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
+#include "cpl_port.h"
+#include "ogr_mem.h"
+
 #include "cpl_conv.h"
 #include "cpl_string.h"
-#include "ogr_mem.h"
+#include "ogr_core.h"
+#include "ogr_spatialref.h"
+#include "ogrsf_frmts.h"
 
 CPL_CVSID("$Id$")
 

diff --git a/gdal/ogr/ogrsf_frmts/mem/ogrmemdriver.cpp b/gdal/ogr/ogrsf_frmts/mem/ogrmemdriver.cpp
@@ -26,9 +26,14 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
+#include "cpl_port.h"
+#include "ogr_mem.h"
+
 #include "cpl_conv.h"
 #include "cpl_string.h"
-#include "ogr_mem.h"
+#include "gdal.h"
+#include "ogr_core.h"
+#include "ogrsf_frmts.h"
 
 CPL_CVSID("$Id$")
 

diff --git a/gdal/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp b/gdal/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp
@@ -27,11 +27,26 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
-#include "cpl_conv.h"
+#include "cpl_port.h"
 #include "ogr_mem.h"
-#include "ogr_p.h"
 
+#include <cstddef>
+#include <cstring>
 #include <algorithm>
+#include <map>
+#include <new>
+#include <utility>
+
+#include "cpl_conv.h"
+#include "cpl_error.h"
+#include "cpl_vsi.h"
+#include "ogr_api.h"
+#include "ogr_core.h"
+#include "ogr_feature.h"
+#include "ogr_geometry.h"
+#include "ogr_p.h"
+#include "ogr_spatialref.h"
+#include "ogrsf_frmts.h"
 
 CPL_CVSID("$Id$")
 
@@ -742,9 +757,9 @@ OGRErr OGRMemLayer::AlterFieldDefn( int iField, OGRFieldDefn *poNewFieldDefn,
             {
                 if( poNewFieldDefn->GetType() != OFTString )
                 {
-                    CPLError( CE_Failure, CPLE_NotSupported,
-                              "Can only convert from OFTInteger to OFTReal, "
-                              "or from anything to OFTString" );
+                    CPLError(CE_Failure, CPLE_NotSupported,
+                             "Can only convert from OFTInteger to OFTReal, "
+                             "or from anything to OFTString");
                     return OGRERR_FAILURE;
                 }
             }