Merge pull request #6 from ossimlabs/std

Std namespace fixes
ossimlabs · Aug 6, 2019 · ea37668 · ea37668
2 parents 75f1719 + 5a3849d
commit ea37668
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -37,7 +37,7 @@ node ("${BUILD_NODE}") {
 
         stage( "Checkout" ) {
             dir( "ossim-csm-plugin" ) {
-                git branch: "${ OSSIM_GIT_BRANCH }", 
+                git branch: "std",
                 url: "${GIT_PUBLIC_SERVER_URL}/ossim-csm-plugin.git",
                 credentialsId: "${CREDENTIALS_ID}"
             }
@@ -116,7 +116,7 @@ node ("${BUILD_NODE}") {
         }
 
         stage('Fortify SCA') {
-            if(BUILD_FORTIFY == "true"){
+            if(BUILD_WITH_FORTIFY == "true"){
                 dir("${env.WORKSPACE}/build") {
                     withCredentials([[$class: 'UsernamePasswordMultiBinding',
                             credentialsId: 'fortifyCredentials',

diff --git a/src/ossimCsmProjectionFactory.cpp b/src/ossimCsmProjectionFactory.cpp
@@ -15,6 +15,8 @@
 
 static ossimTrace traceDebug("ossimCsmProjectionFactory:debug");
 
+using namespace std;
+
 ossimCsmProjectionFactory* ossimCsmProjectionFactory::theInstance = 0;
 
 ossimCsmProjectionFactory* ossimCsmProjectionFactory::instance()

diff --git a/src/ossimCsmSensorModel.cpp b/src/ossimCsmSensorModel.cpp
@@ -36,6 +36,7 @@ static const ossimString PARAM_UNITS[] ={"pixel",
 static ossimTrace traceDebug("ossimCsmSensorModel:debug");
 
 using namespace csm;
+using namespace std;
 
 RTTI_DEF1(ossimCsmSensorModel, "ossimCsmSensorModel", ossimSensorModel);