Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finish removing Objexx gio #8248

Merged
merged 16 commits into from
Oct 19, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove remaining file IO files from objexx
lefticus committed Sep 2, 2020
commit 38f24aa8390b8b744fcf8bf6b3527bf248c16d59
2 changes: 0 additions & 2 deletions src/EnergyPlus/EnergyPlus.hh
Original file line number Diff line number Diff line change
@@ -80,7 +80,6 @@ typedef std::int64_t Int64;
#include <ObjexxFCL/Array4D.fwd.hh>
#include <ObjexxFCL/Array5D.fwd.hh>
#include <ObjexxFCL/Array6D.fwd.hh>
#include <ObjexxFCL/IOFlags.fwd.hh>
#include <ObjexxFCL/MArray1.fwd.hh>
#include <ObjexxFCL/Omit.fwd.hh>
#include <ObjexxFCL/Optional.fwd.hh>
@@ -130,7 +129,6 @@ using ObjexxFCL::Array4D;
using ObjexxFCL::Array4D_int;
using ObjexxFCL::Array5D;
using ObjexxFCL::Array6D;
using ObjexxFCL::IOFlags;
using ObjexxFCL::MArray1;
using ObjexxFCL::Optional;
using ObjexxFCL::Optional_bool;
30 changes: 6 additions & 24 deletions third_party/ObjexxFCL/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -84,9 +84,7 @@ set(src
src/ObjexxFCL/ArrayS.hh
src/ObjexxFCL/ArrayTail.fwd.hh
src/ObjexxFCL/ArrayTail.hh
src/ObjexxFCL/Backspace.cc
src/ObjexxFCL/Backspace.hh
src/ObjexxFCL/BArray.cc
src/ObjexxFCL/BArray.cc
src/ObjexxFCL/BArray.fwd.hh
src/ObjexxFCL/BArray.hh
src/ObjexxFCL/bit.hh
@@ -117,12 +115,6 @@ set(src
src/ObjexxFCL/environment.hh
src/ObjexxFCL/floops.hh
src/ObjexxFCL/Fmath.hh
src/ObjexxFCL/fmt.cc
src/ObjexxFCL/fmt.hh
src/ObjexxFCL/fmt.manipulators.hh
src/ObjexxFCL/Format.cc
src/ObjexxFCL/Format.hh
src/ObjexxFCL/FormattedIO.hh
src/ObjexxFCL/Index.cc
src/ObjexxFCL/Index.fwd.hh
src/ObjexxFCL/Index.hh
@@ -133,10 +125,7 @@ set(src
src/ObjexxFCL/IndexSlice.fwd.hh
src/ObjexxFCL/IndexSlice.hh
src/ObjexxFCL/InitializerSentinel.hh
src/ObjexxFCL/IOFlags.cc
src/ObjexxFCL/IOFlags.fwd.hh
src/ObjexxFCL/IOFlags.hh
src/ObjexxFCL/MArray.all.fwd.hh
src/ObjexxFCL/MArray.all.fwd.hh
src/ObjexxFCL/MArray.all.hh
src/ObjexxFCL/MArray.functions.hh
src/ObjexxFCL/MArray.fwd.hh
@@ -170,16 +159,11 @@ set(src
src/ObjexxFCL/ProxySentinel.hh
src/ObjexxFCL/random.cc
src/ObjexxFCL/random.hh
src/ObjexxFCL/Read.cc
src/ObjexxFCL/Read.fwd.hh
src/ObjexxFCL/Read.hh
src/ObjexxFCL/Reference.fwd.hh
src/ObjexxFCL/Reference.fwd.hh
src/ObjexxFCL/Reference.hh
src/ObjexxFCL/Required.fwd.hh
src/ObjexxFCL/Required.hh
src/ObjexxFCL/Rewind.cc
src/ObjexxFCL/Rewind.hh
src/ObjexxFCL/rvalue_cast.hh
src/ObjexxFCL/rvalue_cast.hh
src/ObjexxFCL/sbyte.fwd.hh
src/ObjexxFCL/sbyte.hh
src/ObjexxFCL/SetWrapper.fwd.hh
@@ -227,8 +211,7 @@ set( test_src
tst/unit/Array6S.unit.cc
tst/unit/ArrayInitializer.unit.cc
tst/unit/ArrayS.unit.cc
tst/unit/Backspace.unit.cc
tst/unit/bit.unit.cc
tst/unit/bit.unit.cc
tst/unit/byte.unit.cc
tst/unit/CArray.unit.cc
tst/unit/CArrayA.unit.cc
@@ -258,8 +241,7 @@ set( test_src
tst/unit/ObjexxFCL.unit.hh
tst/unit/Optional.unit.cc
tst/unit/random.unit.cc
tst/unit/Read.unit.cc
tst/unit/Reference.Optional.unit.cc
tst/unit/Reference.Optional.unit.cc
tst/unit/Reference.unit.cc
tst/unit/Required.unit.cc
tst/unit/Sticky.unit.cc
1 change: 0 additions & 1 deletion third_party/ObjexxFCL/src/ObjexxFCL/Array.hh
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@
#include <ObjexxFCL/ArrayS.hh>
#include <ObjexxFCL/ArrayTail.hh>
#include <ObjexxFCL/CArrayA.hh>
#include <ObjexxFCL/fmt.hh>
#include <ObjexxFCL/InitializerSentinel.hh>
#include <ObjexxFCL/MArray.hh>
#include <ObjexxFCL/ProxySentinel.hh>
1 change: 0 additions & 1 deletion third_party/ObjexxFCL/src/ObjexxFCL/ArrayS.hh
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
// ObjexxFCL Headers
#include <ObjexxFCL/ArrayS.fwd.hh>
#include <ObjexxFCL/BArray.hh>
#include <ObjexxFCL/fmt.hh>
#include <ObjexxFCL/TypeTraits.hh>

// C++ Headers
98 changes: 0 additions & 98 deletions third_party/ObjexxFCL/src/ObjexxFCL/Backspace.cc

This file was deleted.

58 changes: 0 additions & 58 deletions third_party/ObjexxFCL/src/ObjexxFCL/Backspace.hh

This file was deleted.

1,700 changes: 0 additions & 1,700 deletions third_party/ObjexxFCL/src/ObjexxFCL/Format.cc

This file was deleted.

4,905 changes: 0 additions & 4,905 deletions third_party/ObjexxFCL/src/ObjexxFCL/Format.hh

This file was deleted.

23 changes: 0 additions & 23 deletions third_party/ObjexxFCL/src/ObjexxFCL/FormattedIO.hh

This file was deleted.

191 changes: 0 additions & 191 deletions third_party/ObjexxFCL/src/ObjexxFCL/IOFlags.cc

This file was deleted.

23 changes: 0 additions & 23 deletions third_party/ObjexxFCL/src/ObjexxFCL/IOFlags.fwd.hh

This file was deleted.

1,449 changes: 0 additions & 1,449 deletions third_party/ObjexxFCL/src/ObjexxFCL/IOFlags.hh

This file was deleted.

1 change: 0 additions & 1 deletion third_party/ObjexxFCL/src/ObjexxFCL/MArray.hh
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@

// ObjexxFCL Headers
#include <ObjexxFCL/BArray.hh>
#include <ObjexxFCL/fmt.hh>
#include <ObjexxFCL/TypeTraits.hh>

// C++ Headers
19 changes: 0 additions & 19 deletions third_party/ObjexxFCL/src/ObjexxFCL/Read.cc

This file was deleted.

23 changes: 0 additions & 23 deletions third_party/ObjexxFCL/src/ObjexxFCL/Read.fwd.hh

This file was deleted.

890 changes: 0 additions & 890 deletions third_party/ObjexxFCL/src/ObjexxFCL/Read.hh

This file was deleted.

75 changes: 0 additions & 75 deletions third_party/ObjexxFCL/src/ObjexxFCL/Rewind.cc

This file was deleted.

50 changes: 0 additions & 50 deletions third_party/ObjexxFCL/src/ObjexxFCL/Rewind.hh

This file was deleted.

82 changes: 0 additions & 82 deletions third_party/ObjexxFCL/src/ObjexxFCL/fmt.cc

This file was deleted.

639 changes: 0 additions & 639 deletions third_party/ObjexxFCL/src/ObjexxFCL/fmt.hh

This file was deleted.

632 changes: 0 additions & 632 deletions third_party/ObjexxFCL/src/ObjexxFCL/fmt.manipulators.hh

This file was deleted.

60 changes: 0 additions & 60 deletions third_party/ObjexxFCL/tst/unit/Backspace.unit.cc

This file was deleted.

141 changes: 0 additions & 141 deletions third_party/ObjexxFCL/tst/unit/Read.unit.cc

This file was deleted.

24 changes: 10 additions & 14 deletions tst/EnergyPlus/unit/Fixtures/EnergyPlusFixture.cc
Original file line number Diff line number Diff line change
@@ -120,20 +120,16 @@ void EnergyPlusFixture::SetUp()

void EnergyPlusFixture::TearDown()
{

{
state.files.mtd.del();
state.files.eso.del();
state.files.err_stream.reset();
state.files.eio.del();
state.files.debug.del();
state.files.zsz.del();
state.files.ssz.del();
state.files.mtr.del();
state.files.bnd.del();
state.files.shade.del();
}

state.files.mtd.del();
state.files.eso.del();
state.files.err_stream.reset();
state.files.eio.del();
state.files.debug.del();
state.files.zsz.del();
state.files.ssz.del();
state.files.mtr.del();
state.files.bnd.del();
state.files.shade.del();
clearAllStates(this->state);
}