Unverified Commit 2bde5c6b authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Updated GCC4 environment (#3889) 

* Updated GCC4 environment

* Fixed warning in SpiceRotation unit test
parent 77a0a781

environment_gcc4.yml

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ channels: 
  - defaults



dependencies:

  - ale=0.7.2

  - ale>=0.8.0

  - boost=1.68.0

  - armadillo

  - blas
@@ -41,7 +41,7 @@ dependencies: 
  - nanoflann

  - nlohmann_json

  - ninja==1.7.2

  - conda-forge/label/gcc7::nn

  - nn=1.86.0=h470a237_1003

  - opencv>=3.0.0,<=4.0.0

  - openssl

  - pcl=1.8.1

isis/src/base/objs/SpiceRotation/unitTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ int main(int argc, char *argv[]) { 
  cout << " }" << endl;

  vector<int> constChain = aleQuatRot.ConstantFrameChain();

  cout << "Time dependent frame chain = { ";

  for (int i = 0; i < constChain.size(); i++) {

  for (unsigned int i = 0; i < constChain.size(); i++) {

    if (i > 0) {

      cout << ", ";

    }
@@ -681,7 +681,7 @@ int main(int argc, char *argv[]) { 
  aleQuatConstRot.LoadCache(aleQuatConstIsd);

  timeDepChain = aleQuatConstRot.TimeFrameChain();

  cout << "Time dependent frame chain = { ";

  for (int i = 0; i < timeDepChain.size(); i++) {

  for (unsigned int i = 0; i < timeDepChain.size(); i++) {

    if (i > 0) {

      cout << ", ";

    }
@@ -690,7 +690,7 @@ int main(int argc, char *argv[]) { 
  cout << " }" << endl;

  constChain = aleQuatConstRot.ConstantFrameChain();

  cout << "Time dependent frame chain = { ";

  for (int i = 0; i < constChain.size(); i++) {

  for (unsigned int i = 0; i < constChain.size(); i++) {

    if (i > 0) {

      cout << ", ";

    }