From 2088aa86c1f680623c28354d0751e9b020f97adc Mon Sep 17 00:00:00 2001
From: Tyler Culp <tylercculp@gmail.com>
Date: Tue, 6 Aug 2019 12:27:42 -0400
Subject: [PATCH 1/8] Removed 'using namespace std's

---
 cnes/src/ossimFormosatDimapSupportData.h | 1 -
 cnes/src/ossimFormosatModel.h            | 1 -
 cnes/src/ossimGeometricSarSensorModel.h  | 1 -
 cnes/src/ossimPleiadesDimapSupportData.h | 3 +--
 cnes/src/ossimRadarSat2ProductDoc.h      | 1 -
 cnes/src/ossimSpot6DimapSupportData.h    | 1 -
 gdal/src/ossimGdalOgrVectorAnnotation.h  | 1 -
 gdal/src/ossimGdalTileSource.h           | 1 -
 gdal/src/ossimGdalWriter.h               | 1 -
 kakadu/src/ossimKakaduJ2kReader.h        | 1 -
 10 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/cnes/src/ossimFormosatDimapSupportData.h b/cnes/src/ossimFormosatDimapSupportData.h
index 3faee29..0e9ca6e 100644
--- a/cnes/src/ossimFormosatDimapSupportData.h
+++ b/cnes/src/ossimFormosatDimapSupportData.h
@@ -29,7 +29,6 @@
 #include <vector>
 #include <iostream>
 
-using namespace std;
 
 class ossimKeywordlist;
 // class ossimRefPtr;
diff --git a/cnes/src/ossimFormosatModel.h b/cnes/src/ossimFormosatModel.h
index 66d3420..aea0f93 100644
--- a/cnes/src/ossimFormosatModel.h
+++ b/cnes/src/ossimFormosatModel.h
@@ -15,7 +15,6 @@
 #define ossimFormosatModel_HEADER
 
 #include <iostream>
-using namespace std;
 
 #include <ossim/plugin/ossimPluginConstants.h>
 #include <ossim/projection/ossimSensorModel.h>
diff --git a/cnes/src/ossimGeometricSarSensorModel.h b/cnes/src/ossimGeometricSarSensorModel.h
index fcc779a..092d673 100644
--- a/cnes/src/ossimGeometricSarSensorModel.h
+++ b/cnes/src/ossimGeometricSarSensorModel.h
@@ -19,7 +19,6 @@
 #include <list>
 #include <vector>
 
-using namespace std;
 
 namespace ossimplugins
 {
diff --git a/cnes/src/ossimPleiadesDimapSupportData.h b/cnes/src/ossimPleiadesDimapSupportData.h
index 58fb08a..7812104 100644
--- a/cnes/src/ossimPleiadesDimapSupportData.h
+++ b/cnes/src/ossimPleiadesDimapSupportData.h
@@ -47,7 +47,6 @@
 #include <vector>
 #include <iostream>
 
-using namespace std;
 
 
 class ossimKeywordlist;
@@ -85,7 +84,7 @@ namespace ossimplugins
          //---
          // Convenient method to print important image info:
          //---
-         void  printInfo (ostream& os) const;
+         void  printInfo (std::ostream& os) const;
 
          /**
           * Method to save the state of the object to a keyword list.
diff --git a/cnes/src/ossimRadarSat2ProductDoc.h b/cnes/src/ossimRadarSat2ProductDoc.h
index ee5e67f..ebd901d 100644
--- a/cnes/src/ossimRadarSat2ProductDoc.h
+++ b/cnes/src/ossimRadarSat2ProductDoc.h
@@ -29,7 +29,6 @@ class ossimXmlNode;
 class ossimString;
 
 
-using namespace std;
 
 typedef struct
 {
diff --git a/cnes/src/ossimSpot6DimapSupportData.h b/cnes/src/ossimSpot6DimapSupportData.h
index deaed3d..adede8c 100644
--- a/cnes/src/ossimSpot6DimapSupportData.h
+++ b/cnes/src/ossimSpot6DimapSupportData.h
@@ -47,7 +47,6 @@
 #include <vector>
 #include <iostream>
 
-using namespace std;
 
 
 class ossimKeywordlist;
diff --git a/gdal/src/ossimGdalOgrVectorAnnotation.h b/gdal/src/ossimGdalOgrVectorAnnotation.h
index c3ce78e..5e89f1c 100644
--- a/gdal/src/ossimGdalOgrVectorAnnotation.h
+++ b/gdal/src/ossimGdalOgrVectorAnnotation.h
@@ -26,7 +26,6 @@
 #include <ossim/imaging/ossimImageGeometry.h>
 #include <ossim/projection/ossimProjection.h>
 
-using namespace std;
 
 class ossimProjection;
 class ossimMapProjection;
diff --git a/gdal/src/ossimGdalTileSource.h b/gdal/src/ossimGdalTileSource.h
index d1af618..f6375d9 100644
--- a/gdal/src/ossimGdalTileSource.h
+++ b/gdal/src/ossimGdalTileSource.h
@@ -26,7 +26,6 @@
 #include <vector>
 #include <ossim/imaging/ossimAppFixedTileCache.h>
 
-using namespace std;
 
 class ossimImageData;
 
diff --git a/gdal/src/ossimGdalWriter.h b/gdal/src/ossimGdalWriter.h
index 5623c36..327dc32 100644
--- a/gdal/src/ossimGdalWriter.h
+++ b/gdal/src/ossimGdalWriter.h
@@ -14,7 +14,6 @@
 #include <ossim/base/ossimKeywordlist.h>
 #include <ossim/imaging/ossimNBandToIndexFilter.h>
 
-using namespace std;
 
 class ossimXmlNode;
 
diff --git a/kakadu/src/ossimKakaduJ2kReader.h b/kakadu/src/ossimKakaduJ2kReader.h
index 603e5d3..c4e2713 100644
--- a/kakadu/src/ossimKakaduJ2kReader.h
+++ b/kakadu/src/ossimKakaduJ2kReader.h
@@ -31,7 +31,6 @@ class ossimImageData;
 #include <kdu_compressed.h>
 // #include <kdu_region_decompressor.h>
 
-using namespace std;
 
 namespace kdu_core
 {

From fe2c89e44f3b91ff07b5c4051fee1d7667f822c8 Mon Sep 17 00:00:00 2001
From: Tyler Culp <tylercculp@gmail.com>
Date: Tue, 6 Aug 2019 12:38:20 -0400
Subject: [PATCH 2/8] Added using namespace std to cpp files

---
 cnes/src/ossimAlosPalsarModel.cpp          | 2 ++
 cnes/src/ossimCosmoSkymedModel.cpp         | 2 ++
 cnes/src/ossimEnvisatAsarModel.cpp         | 2 ++
 cnes/src/ossimErsSarModel.cpp              | 2 ++
 cnes/src/ossimFormosatDimapSupportData.cpp | 2 ++
 cnes/src/ossimFormosatDimapSupportData.h   | 2 +-
 cnes/src/ossimFormosatModel.cpp            | 2 ++
 cnes/src/ossimFormosatModel.h              | 2 +-
 cnes/src/ossimGeometricSarSensorModel.cpp  | 2 ++
 cnes/src/ossimPleiadesDimapSupportData.cpp | 2 ++
 cnes/src/ossimPleiadesModel.cpp            | 1 +
 cnes/src/ossimPluginCommon.cpp             | 3 +++
 cnes/src/ossimPluginInit.cpp               | 1 +
 cnes/src/ossimPluginProjectionFactory.cpp  | 2 ++
 cnes/src/ossimPluginReaderFactory.cpp      | 2 ++
 cnes/src/ossimRadarSat2Model.cpp           | 2 ++
 cnes/src/ossimRadarSat2RPCModel.cpp        | 2 ++
 cnes/src/ossimRadarSat2TiffReader.cpp      | 2 ++
 cnes/src/ossimRadarSatModel.cpp            | 2 ++
 cnes/src/ossimSpot6DimapSupportData.cpp    | 2 ++
 cnes/src/ossimSpot6Model.cpp               | 2 ++
 cnes/src/ossimTerraSarModel.cpp            | 2 ++
 cnes/src/ossimTerraSarModel.h              | 2 +-
 cnes/src/ossimTerraSarProductDoc.cpp       | 2 ++
 cnes/src/ossimTerraSarTiffReader.cpp       | 2 ++
 25 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/cnes/src/ossimAlosPalsarModel.cpp b/cnes/src/ossimAlosPalsarModel.cpp
index 2e0e7ed..442b5ad 100644
--- a/cnes/src/ossimAlosPalsarModel.cpp
+++ b/cnes/src/ossimAlosPalsarModel.cpp
@@ -27,6 +27,8 @@
 #include <ossim/base/ossimKeywordNames.h>
 #include <ossim/base/ossimTrace.h>
 
+using namespace std;
+
 
 // Static trace for debugging
 static ossimTrace traceDebug("ossimAlosPalsarModel:debug");
diff --git a/cnes/src/ossimCosmoSkymedModel.cpp b/cnes/src/ossimCosmoSkymedModel.cpp
index 4e6c8aa..176660a 100644
--- a/cnes/src/ossimCosmoSkymedModel.cpp
+++ b/cnes/src/ossimCosmoSkymedModel.cpp
@@ -23,6 +23,8 @@
 #include <otb/RefPoint.h>
 #include <otb/SarSensor.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 
diff --git a/cnes/src/ossimEnvisatAsarModel.cpp b/cnes/src/ossimEnvisatAsarModel.cpp
index 48a74c4..677d703 100644
--- a/cnes/src/ossimEnvisatAsarModel.cpp
+++ b/cnes/src/ossimEnvisatAsarModel.cpp
@@ -28,6 +28,8 @@
 #include <otb/RefPoint.h>
 #include <otb/SarSensor.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 
diff --git a/cnes/src/ossimErsSarModel.cpp b/cnes/src/ossimErsSarModel.cpp
index 6c98089..3b2fa5b 100644
--- a/cnes/src/ossimErsSarModel.cpp
+++ b/cnes/src/ossimErsSarModel.cpp
@@ -31,6 +31,8 @@ static ossimTrace traceDebug("ossimErsSarModel:debug");
 #include <string>
 #include <algorithm>
 
+using namespace std;
+
 namespace ossimplugins
 {
 
diff --git a/cnes/src/ossimFormosatDimapSupportData.cpp b/cnes/src/ossimFormosatDimapSupportData.cpp
index 2a59d4a..b84799d 100644
--- a/cnes/src/ossimFormosatDimapSupportData.cpp
+++ b/cnes/src/ossimFormosatDimapSupportData.cpp
@@ -28,6 +28,8 @@
 // Define Trace flags for use within this file:
 static ossimTrace traceDebug ("ossimFormosatDimapSupportData:debug");
 
+using namespace std;
+
 static const ossim_uint32  LAGRANGE_FILTER_SIZE = 8; // num samples considered
 
 ossimFormosatDimapSupportData::ossimFormosatDimapSupportData ()
diff --git a/cnes/src/ossimFormosatDimapSupportData.h b/cnes/src/ossimFormosatDimapSupportData.h
index 0e9ca6e..29d7bf4 100644
--- a/cnes/src/ossimFormosatDimapSupportData.h
+++ b/cnes/src/ossimFormosatDimapSupportData.h
@@ -150,7 +150,7 @@ class OSSIM_PLUGINS_DLL ossimFormosatDimapSupportData :
    //---
    // Convenient method to print important image info:
    //---
-   void  printInfo (ostream& os) const;
+   void  printInfo (std::ostream& os) const;
 
    virtual bool saveState(ossimKeywordlist& kwl,
                           const char* prefix = 0)const;
diff --git a/cnes/src/ossimFormosatModel.cpp b/cnes/src/ossimFormosatModel.cpp
index 7ef111f..26bd088 100644
--- a/cnes/src/ossimFormosatModel.cpp
+++ b/cnes/src/ossimFormosatModel.cpp
@@ -29,6 +29,8 @@ using namespace std;
 
 #include <ossimFormosatDimapSupportData.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 RTTI_DEF1(ossimFormosatModel, "ossimFormosatModel", ossimSensorModel);
diff --git a/cnes/src/ossimFormosatModel.h b/cnes/src/ossimFormosatModel.h
index aea0f93..99e1705 100644
--- a/cnes/src/ossimFormosatModel.h
+++ b/cnes/src/ossimFormosatModel.h
@@ -81,7 +81,7 @@ class OSSIM_PLUGINS_DLL ossimFormosatModel : public ossimSensorModel
     * Writes a template of geom keywords processed by loadState and saveState
     * to output stream.
     */
-   static void writeGeomTemplate(ostream& os);
+   static void writeGeomTemplate(std::ostream& os);
 
    /*!
     * Given an image point and height, initializes worldPoint.
diff --git a/cnes/src/ossimGeometricSarSensorModel.cpp b/cnes/src/ossimGeometricSarSensorModel.cpp
index cc0ab80..714c9d8 100644
--- a/cnes/src/ossimGeometricSarSensorModel.cpp
+++ b/cnes/src/ossimGeometricSarSensorModel.cpp
@@ -23,6 +23,8 @@
 #include <cmath>
 #include <string>
 
+using namespace std;
+
 namespace ossimplugins
 {
 
diff --git a/cnes/src/ossimPleiadesDimapSupportData.cpp b/cnes/src/ossimPleiadesDimapSupportData.cpp
index a4424c3..06e7004 100644
--- a/cnes/src/ossimPleiadesDimapSupportData.cpp
+++ b/cnes/src/ossimPleiadesDimapSupportData.cpp
@@ -46,6 +46,8 @@
 #include <iterator>
 #include <sstream>
 
+using namespace std;
+
 
 // Define Trace flags for use within this file:
 static ossimTrace traceExec  ("ossimPleiadesDimapSupportData:exec");
diff --git a/cnes/src/ossimPleiadesModel.cpp b/cnes/src/ossimPleiadesModel.cpp
index a37df3f..9e301fe 100644
--- a/cnes/src/ossimPleiadesModel.cpp
+++ b/cnes/src/ossimPleiadesModel.cpp
@@ -44,6 +44,7 @@
 #include <ossim/base/ossimXmlNode.h>
 #include <ossim/support_data/ossimSupportFilesList.h>
 
+using namespace std;
 
 namespace ossimplugins
 {
diff --git a/cnes/src/ossimPluginCommon.cpp b/cnes/src/ossimPluginCommon.cpp
index 611eb65..af35ec2 100644
--- a/cnes/src/ossimPluginCommon.cpp
+++ b/cnes/src/ossimPluginCommon.cpp
@@ -21,6 +21,9 @@
 #include <ossim/base/ossimXmlNode.h>
 #include <otb/CivilDateTime.h>
 #include <ossim/base/ossimTrace.h>
+
+using namespace std;
+
 static ossimTrace traceDebug("ossimPluginCommon:debug");
 namespace ossimplugins
 {
diff --git a/cnes/src/ossimPluginInit.cpp b/cnes/src/ossimPluginInit.cpp
index e2866f1..896d2a1 100644
--- a/cnes/src/ossimPluginInit.cpp
+++ b/cnes/src/ossimPluginInit.cpp
@@ -15,6 +15,7 @@
 #include <ossimPluginProjectionFactory.h>
 #include <ossimPluginReaderFactory.h>
 
+using namespace std;
 
 namespace ossimplugins
 {
diff --git a/cnes/src/ossimPluginProjectionFactory.cpp b/cnes/src/ossimPluginProjectionFactory.cpp
index 427ad15..d07cdf5 100644
--- a/cnes/src/ossimPluginProjectionFactory.cpp
+++ b/cnes/src/ossimPluginProjectionFactory.cpp
@@ -44,6 +44,8 @@ static ossimTrace traceDebug = ossimTrace("ossimPluginProjectionFactory:debug");
 #include <ossimFormosatModel.h>
 #include <ossimFormosatDimapSupportData.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 
diff --git a/cnes/src/ossimPluginReaderFactory.cpp b/cnes/src/ossimPluginReaderFactory.cpp
index 6601ad1..6bfdf66 100644
--- a/cnes/src/ossimPluginReaderFactory.cpp
+++ b/cnes/src/ossimPluginReaderFactory.cpp
@@ -21,6 +21,8 @@
 #include <ossim/base/ossimTrace.h>
 #include <ossim/base/ossimKeywordNames.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 
diff --git a/cnes/src/ossimRadarSat2Model.cpp b/cnes/src/ossimRadarSat2Model.cpp
index dd46447..85d8ad3 100644
--- a/cnes/src/ossimRadarSat2Model.cpp
+++ b/cnes/src/ossimRadarSat2Model.cpp
@@ -33,6 +33,8 @@
 #include <otb/RefPoint.h>
 #include <otb/SarSensor.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 // Keyword constants:
diff --git a/cnes/src/ossimRadarSat2RPCModel.cpp b/cnes/src/ossimRadarSat2RPCModel.cpp
index 6271ecb..5a49925 100644
--- a/cnes/src/ossimRadarSat2RPCModel.cpp
+++ b/cnes/src/ossimRadarSat2RPCModel.cpp
@@ -35,6 +35,8 @@
 #include <otb/SensorParams.h>
 #include <otb/SarSensor.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 
diff --git a/cnes/src/ossimRadarSat2TiffReader.cpp b/cnes/src/ossimRadarSat2TiffReader.cpp
index 1db14de..9e94030 100644
--- a/cnes/src/ossimRadarSat2TiffReader.cpp
+++ b/cnes/src/ossimRadarSat2TiffReader.cpp
@@ -25,6 +25,8 @@
 #include <ossim/projection/ossimProjection.h>
 #include <ossim/projection/ossimProjectionFactoryRegistry.h>
 
+using namespace std;
+
 // Keyword constants:
 static const char PRODUCT_XML_FILE_KW[] = "product_xml_filename";
 
diff --git a/cnes/src/ossimRadarSatModel.cpp b/cnes/src/ossimRadarSatModel.cpp
index dd9e2de..8867852 100644
--- a/cnes/src/ossimRadarSatModel.cpp
+++ b/cnes/src/ossimRadarSatModel.cpp
@@ -38,6 +38,8 @@
 #include <RadarSat/CommonRecord/ProcessingParameters.h>
 #include <RadarSat/Leader/PlatformPositionData.h>
 
+using namespace std;
+
 namespace ossimplugins
 {
 RTTI_DEF1(ossimRadarSatModel, "ossimRadarSatModel", ossimGeometricSarSensorModel);
diff --git a/cnes/src/ossimSpot6DimapSupportData.cpp b/cnes/src/ossimSpot6DimapSupportData.cpp
index 6856715..22ef51e 100644
--- a/cnes/src/ossimSpot6DimapSupportData.cpp
+++ b/cnes/src/ossimSpot6DimapSupportData.cpp
@@ -46,6 +46,8 @@
 #include <iterator>
 #include <sstream>
 
+using namespace std;
+
 
 // Define Trace flags for use within this file:
 static ossimTrace traceExec  ("ossimSpot6DimapSupportData:exec");
diff --git a/cnes/src/ossimSpot6Model.cpp b/cnes/src/ossimSpot6Model.cpp
index 2210b71..40e71dd 100644
--- a/cnes/src/ossimSpot6Model.cpp
+++ b/cnes/src/ossimSpot6Model.cpp
@@ -44,6 +44,8 @@
 #include <ossim/base/ossimXmlNode.h>
 #include <ossim/support_data/ossimSupportFilesList.h>
 
+using namespace std;
+
 
 namespace ossimplugins
 {
diff --git a/cnes/src/ossimTerraSarModel.cpp b/cnes/src/ossimTerraSarModel.cpp
index 56c24d5..5f48b29 100644
--- a/cnes/src/ossimTerraSarModel.cpp
+++ b/cnes/src/ossimTerraSarModel.cpp
@@ -33,6 +33,8 @@
 #include <iostream>
 #include <sstream>
 
+using namespace std;
+
 
 // Keyword constants:
 static const char NUMBER_SRGR_COEFFICIENTS_KW[] = "sr_gr_coeffs_count";
diff --git a/cnes/src/ossimTerraSarModel.h b/cnes/src/ossimTerraSarModel.h
index 69461be..8d931b8 100644
--- a/cnes/src/ossimTerraSarModel.h
+++ b/cnes/src/ossimTerraSarModel.h
@@ -105,7 +105,7 @@ namespace ossimplugins
       //---
    	  // Convenient method to print important image info:
       //---
-      void  printInfo (ostream& os) const;
+      void  printInfo (std::ostream& os) const;
    
       private:
 
diff --git a/cnes/src/ossimTerraSarProductDoc.cpp b/cnes/src/ossimTerraSarProductDoc.cpp
index 7f1ef5b..8008c39 100644
--- a/cnes/src/ossimTerraSarProductDoc.cpp
+++ b/cnes/src/ossimTerraSarProductDoc.cpp
@@ -35,6 +35,8 @@
 #include <ossim/base/ossimXmlDocument.h>
 #include <ossim/base/ossimXmlNode.h>
 
+using namespace std;
+
 // Static trace for debugging
 static ossimTrace traceDebug("ossimTerraSarProductDoc:debug");
 
diff --git a/cnes/src/ossimTerraSarTiffReader.cpp b/cnes/src/ossimTerraSarTiffReader.cpp
index 86093a8..b1c5584 100644
--- a/cnes/src/ossimTerraSarTiffReader.cpp
+++ b/cnes/src/ossimTerraSarTiffReader.cpp
@@ -24,6 +24,8 @@
 #include <ossim/projection/ossimProjectionFactoryRegistry.h>
 #include <ossim/support_data/ossimGeoTiff.h>
 
+using namespace std;
+
 // Keyword constants:
 static const char PRODUCT_XML_FILE_KW[] = "product_xml_filename";
 

From caaca9377f521f9b262817d34ce5d72f2905260a Mon Sep 17 00:00:00 2001
From: Tyler Culp <tylercculp@gmail.com>
Date: Tue, 6 Aug 2019 12:48:39 -0400
Subject: [PATCH 3/8] Added more std::s for vectors

---
 gdal/src/ossimGdalOgrVectorAnnotation.h | 6 +++---
 gdal/src/ossimGdalTileSource.h          | 2 +-
 gdal/src/ossimGdalWriter.h              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gdal/src/ossimGdalOgrVectorAnnotation.h b/gdal/src/ossimGdalOgrVectorAnnotation.h
index 5e89f1c..82c1191 100644
--- a/gdal/src/ossimGdalOgrVectorAnnotation.h
+++ b/gdal/src/ossimGdalOgrVectorAnnotation.h
@@ -93,7 +93,7 @@ class OSSIM_PLUGINS_DLL ossimGdalOgrVectorAnnotation :
    //OGRLayer::GetExtent() returns the MBR (minimal bounding rect) of the data in the layer. 
    //So when only do ossim-info, it is not necessary to go through each feature to calculate
    //the bounding which cause the memory allocate problem when the shape file is large.
-   void initializeBoundingRec(vector<ossimGpt> points);
+   void initializeBoundingRec(std::vector<ossimGpt> points);
 
    bool setCurrentEntry(ossim_uint32 entryIdx);
 
@@ -103,7 +103,7 @@ class OSSIM_PLUGINS_DLL ossimGdalOgrVectorAnnotation :
    ossimFilename                       theFilename;
    OGREnvelope                         theBoundingExtent;
    ossimRefPtr<ossimImageGeometry>     theImageGeometry;
-   vector<bool>                        theLayersToRenderFlagList;
+   std::vector<bool>                        theLayersToRenderFlagList;
    std::vector<ossimOgrGdalLayerNode*> theLayerTable;
    ossimRgbVector                      thePenColor;
    ossimRgbVector                      theBrushColor;
@@ -138,7 +138,7 @@ class OSSIM_PLUGINS_DLL ossimGdalOgrVectorAnnotation :
    
    void getFeatures(std::list<long>& result,
                     const ossimIrect& rect);
-   void getFeature(vector<ossimAnnotationObject*>& featureList,
+   void getFeature(std::vector<ossimAnnotationObject*>& featureList,
                    long id);
    ossimProjection* createProjFromReference(OGRSpatialReference* reference)const;
    void initializeTables();
diff --git a/gdal/src/ossimGdalTileSource.h b/gdal/src/ossimGdalTileSource.h
index f6375d9..87b7d49 100644
--- a/gdal/src/ossimGdalTileSource.h
+++ b/gdal/src/ossimGdalTileSource.h
@@ -336,7 +336,7 @@ class OSSIM_PLUGINS_DLL ossimGdalTileSource : public ossimImageHandler
    bool                        theIsComplexFlag;
    bool                        theAlphaChannelFlag;
    bool                        m_preservePaletteIndexesFlag;
-   vector<ossim_uint32>        m_outputBandList;
+   std::vector<ossim_uint32>        m_outputBandList;
    bool                        m_isBlocked;
 
    std::vector<ossimAppFixedTileCache::ossimAppFixedCacheId> m_rlevelBlockCache;
diff --git a/gdal/src/ossimGdalWriter.h b/gdal/src/ossimGdalWriter.h
index 327dc32..5f490c1 100644
--- a/gdal/src/ossimGdalWriter.h
+++ b/gdal/src/ossimGdalWriter.h
@@ -38,7 +38,7 @@ class ossimGdalWriter : public ossimImageFileWriter
     *
     * Appends this writer image types to list "imageTypeList".
     *
-    * @param imageTypeList stl::vector<ossimString> list to append to.
+    * @param imageTypeList std::vector<ossimString> list to append to.
     */
    virtual void getImageTypeList(std::vector<ossimString>& imageTypeList)const;
    virtual bool hasImageType(const ossimString& imageType) const;
@@ -71,7 +71,7 @@ class ossimGdalWriter : public ossimImageFileWriter
    virtual bool loadState(const ossimKeywordlist& kwl,
                           const char* prefix=0);
 
-   static void getSupportedWriters(vector<ossimString>& writers);
+   static void getSupportedWriters(std::vector<ossimString>& writers);
    
    virtual void setProperty(ossimRefPtr<ossimProperty> property);
    virtual ossimRefPtr<ossimProperty> getProperty(const ossimString& name)const;

From 5eb24a25e83413c84c0b995446f5cd084cf5ae03 Mon Sep 17 00:00:00 2001
From: Tyler Culp <tylercculp@gmail.com>
Date: Tue, 6 Aug 2019 12:59:33 -0400
Subject: [PATCH 4/8] more std::

---
 cnes/src/ossimEnvisatAsarModel.h          | 1 -
 cnes/src/ossimGeometricSarSensorModel.h   | 2 +-
 cnes/src/ossimSpot6DimapSupportData.h     | 5 +----
 gdal/src/ossimGdalOgrVectorAnnotation.cpp | 2 ++
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cnes/src/ossimEnvisatAsarModel.h b/cnes/src/ossimEnvisatAsarModel.h
index 5de457f..3739559 100644
--- a/cnes/src/ossimEnvisatAsarModel.h
+++ b/cnes/src/ossimEnvisatAsarModel.h
@@ -26,7 +26,6 @@
 namespace ossimplugins
 {
 
-
 class PlatformPosition;
 class SensorParams;
 class RefPoint;
diff --git a/cnes/src/ossimGeometricSarSensorModel.h b/cnes/src/ossimGeometricSarSensorModel.h
index 092d673..ffbd3c1 100644
--- a/cnes/src/ossimGeometricSarSensorModel.h
+++ b/cnes/src/ossimGeometricSarSensorModel.h
@@ -72,7 +72,7 @@ class OSSIM_PLUGINS_DLL ossimGeometricSarSensorModel : public ossimSensorModel
     * @param position Position of the sensor at line line
     * @param speed Speed of the sensor at line line
     */
-  virtual bool getPlatformPositionAtLine(double line, vector<double>& position, vector<double>& speed);
+  virtual bool getPlatformPositionAtLine(double line, std::vector<double>& position, std::vector<double>& speed);
 
    /**
     * @brief This function is able to convert image coordinates into world
diff --git a/cnes/src/ossimSpot6DimapSupportData.h b/cnes/src/ossimSpot6DimapSupportData.h
index adede8c..474b1eb 100644
--- a/cnes/src/ossimSpot6DimapSupportData.h
+++ b/cnes/src/ossimSpot6DimapSupportData.h
@@ -43,12 +43,9 @@
 #include <ossim/base/ossimDrect.h>
 #include <ossim/base/ossimGpt.h>
 
-
 #include <vector>
 #include <iostream>
 
-
-
 class ossimKeywordlist;
 class ossimXmlDocument;
 
@@ -83,7 +80,7 @@ namespace ossimplugins
       //---
       // Convenient method to print important image info:
       //---
-      void  printInfo (ostream& os) const;
+      void  printInfo (std::ostream& os) const;
 
       /**
        * Method to save the state of the object to a keyword list.
diff --git a/gdal/src/ossimGdalOgrVectorAnnotation.cpp b/gdal/src/ossimGdalOgrVectorAnnotation.cpp
index 375d106..7388f52 100644
--- a/gdal/src/ossimGdalOgrVectorAnnotation.cpp
+++ b/gdal/src/ossimGdalOgrVectorAnnotation.cpp
@@ -46,6 +46,8 @@
 #include <ogr_api.h>
 #include <sstream>
 
+using namespace std;
+
 RTTI_DEF2(ossimGdalOgrVectorAnnotation,
           "ossimGdalOgrVectorAnnotation",
           ossimAnnotationSource,

From 19f244643efc88ce6f6d4c31f485d08ea94ebd4f Mon Sep 17 00:00:00 2001
From: Tyler Culp <tylercculp@gmail.com>
Date: Tue, 6 Aug 2019 13:05:52 -0400
Subject: [PATCH 5/8] more std::

---
 cnes/src/ossimRadarSat2ProductDoc.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/cnes/src/ossimRadarSat2ProductDoc.h b/cnes/src/ossimRadarSat2ProductDoc.h
index ebd901d..062c800 100644
--- a/cnes/src/ossimRadarSat2ProductDoc.h
+++ b/cnes/src/ossimRadarSat2ProductDoc.h
@@ -19,7 +19,6 @@
 #include <list>
 #include <vector>
 #include <sstream>
-#include <vector>
 
 class ossimDpt;
 class ossimGpt;
@@ -46,10 +45,10 @@ typedef struct
    double latitudeScale;
    double longitudeScale;
    double heightScale;
-   vector<double> lineNumeratorCoefficients;
-   vector<double> lineDenominatorCoefficients;
-   vector<double> pixelNumeratorCoefficients;
-   vector<double> pixelDenominatorCoefficients;
+   std::vector<double> lineNumeratorCoefficients;
+   std::vector<double> lineDenominatorCoefficients;
+   std::vector<double> pixelNumeratorCoefficients;
+   std::vector<double> pixelDenominatorCoefficients;
    
 }RPCModel;
 

From c19a185612d47a68a50d704d165d83443bc5e802 Mon Sep 17 00:00:00 2001
From: Tyler Culp <tylercculp@gmail.com>
Date: Tue, 6 Aug 2019 13:14:01 -0400
Subject: [PATCH 6/8] more std::

---
 gdal/src/ossimGdalTileSource.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdal/src/ossimGdalTileSource.cpp b/gdal/src/ossimGdalTileSource.cpp
index 7c879ef..976065b 100644
--- a/gdal/src/ossimGdalTileSource.cpp
+++ b/gdal/src/ossimGdalTileSource.cpp
@@ -47,6 +47,8 @@
 
 #include <sstream>
 
+using namespace std;
+
 RTTI_DEF1(ossimGdalTileSource, "ossimGdalTileSource", ossimImageHandler)
 
 static ossimOgcWktTranslator wktTranslator;

From 370c64da3aefb200834f1682621e4a82e4a9ca56 Mon Sep 17 00:00:00 2001
From: Tyler Culp <tylercculp@gmail.com>
Date: Tue, 6 Aug 2019 13:21:41 -0400
Subject: [PATCH 7/8] more std::

---
 kakadu/src/ossimKakaduJ2kReader.cpp | 2 ++
 kakadu/src/ossimKakaduJ2kReader.h   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kakadu/src/ossimKakaduJ2kReader.cpp b/kakadu/src/ossimKakaduJ2kReader.cpp
index f7acd5f..aeaf249 100644
--- a/kakadu/src/ossimKakaduJ2kReader.cpp
+++ b/kakadu/src/ossimKakaduJ2kReader.cpp
@@ -37,6 +37,8 @@
 
 #include <fstream>
 #include <iostream>
+
+using namespace std;
  
  
 #ifdef OSSIM_ID_ENABLED
diff --git a/kakadu/src/ossimKakaduJ2kReader.h b/kakadu/src/ossimKakaduJ2kReader.h
index c4e2713..212e6f9 100644
--- a/kakadu/src/ossimKakaduJ2kReader.h
+++ b/kakadu/src/ossimKakaduJ2kReader.h
@@ -128,7 +128,7 @@ class OSSIM_PLUGINS_DLL ossimKakaduJ2kReader :
     * @brief Get array of decimations for all levels.
     * @param decimations Vector to initialize with decimations.
     */
-   virtual void getDecimationFactors(vector<ossimDpt>& decimations) const; 
+   virtual void getDecimationFactors(std::vector<ossimDpt>& decimations) const; 
 
    /**
     * @brief Returns the number of decimation levels.
@@ -337,7 +337,7 @@ inline bool ossimKakaduJ2kReader::seek(kdu_core::kdu_long offset)
    //---
    // All seeks are relative to the start of code stream.
    //---
-   theFileStr.seekg(offset, ios_base::beg);
+   theFileStr.seekg(offset, std::ios_base::beg);
 
    return theFileStr.good();
 }

From 3dc606ca187c1aa599267e6eff90e6fc4b8b67c6 Mon Sep 17 00:00:00 2001
From: Tyler Culp <tylercculp@gmail.com>
Date: Tue, 6 Aug 2019 13:29:08 -0400
Subject: [PATCH 8/8] more std::

---
 gdal/src/ossimHdfReader.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdal/src/ossimHdfReader.cpp b/gdal/src/ossimHdfReader.cpp
index 963e740..23cf231 100644
--- a/gdal/src/ossimHdfReader.cpp
+++ b/gdal/src/ossimHdfReader.cpp
@@ -20,6 +20,8 @@
 #include <ossim/imaging/ossimImageGeometryRegistry.h>
 #include <ossim/imaging/ossimImageDataFactory.h>
 
+using namespace std;
+
 #ifdef OSSIM_ID_ENABLED
 static const char OSSIM_ID[] = "$Id";
 #endif