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

[Core] Some header refactor for consistency and modern C++ standards (pragma) #13076

Merged
merged 1 commit into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
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
11 changes: 3 additions & 8 deletions kratos/includes/table.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
// Multi-Physics
//
// License: BSD License
// Kratos default license: kratos/license.txt
// Kratos default license: kratos/license.txt
//
// Main authors: Pooyan Dadvand
// Riccardo Rossi
//

#if !defined(KRATOS_TABLE_H_INCLUDED )
#define KRATOS_TABLE_H_INCLUDED
#pragma once

// System includes
#include <string>
Expand Down Expand Up @@ -864,8 +863,4 @@ inline std::ostream& operator << (std::ostream& rOStream,

///@} addtogroup block

} // namespace Kratos.

#endif // KRATOS_TABLE_H_INCLUDED defined


} // namespace Kratos.
8 changes: 3 additions & 5 deletions kratos/includes/table_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
// _|\_\_| \__,_|\__|\___/ ____/
// Multi-Physics
//
// License: BSD License
// Kratos default license: kratos/license.txt
// License: BSD License
// Kratos default license: kratos/license.txt
//
// Main authors: Vicente Mataix Ferrandiz
// Inspired in bprinter, work of Dat Chu: https://github.com/dattanchu/bprinter
// Removing all the dependencies of boost::karma and adding bold fonts and additional functionalities needed
//

#ifndef KRATOS_TABLE_STREAM_H_INCLUDED
#define KRATOS_TABLE_STREAM_H_INCLUDED
#pragma once

// System includes
#include <iostream>
Expand Down Expand Up @@ -470,4 +469,3 @@ class TableStream
}; // Class TableStream

} // namespace Kratos.
#endif
13 changes: 6 additions & 7 deletions kratos/includes/thread_fixed_size_memory_pool.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,25 @@
// _|\_\_| \__,_|\__|\___/ ____/
// Multi-Physics
//
// License: BSD License
// Kratos default license: kratos/license.txt
// License: BSD License
// Kratos default license: kratos/license.txt
//
// Main authors: Pooyan Dadvand
//
//

#pragma once

#if !defined(KRATOS_THREAD_FIXED_SIZE_MEMORY_POOL_H_INCLUDED )
#define KRATOS_THREAD_FIXED_SIZE_MEMORY_POOL_H_INCLUDED

// System includes
#include <vector>
#include <list>
#include <algorithm>
#include <atomic>

// External includes
#include "concurrentqueue/concurrentqueue.h"

// Project includes
#include "includes/chunk.h"

namespace Kratos
Expand Down Expand Up @@ -339,5 +340,3 @@ namespace Kratos
///@} addtogroup block

} // namespace Kratos.

#endif // KRATOS_THREAD_FIXED_SIZE_MEMORY_POOL_H_INCLUDED defined
9 changes: 3 additions & 6 deletions kratos/includes/ublas_complex_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
// _|\_\_| \__,_|\__|\___/ ____/
// Multi-Physics
//
// License: BSD License
// Kratos default license: kratos/license.txt
// License: BSD License
// Kratos default license: kratos/license.txt
//
// Main authors: Michael Andre
//

#if !defined(KRATOS_UBLAS_COMPLEX_INTERFACE_H_INCLUDED )
#define KRATOS_UBLAS_COMPLEX_INTERFACE_H_INCLUDED
#pragma once

// System includes
#include <string>
Expand Down Expand Up @@ -76,5 +75,3 @@ typedef matrix_slice<ComplexMatrix> ComplexMatrixSlice;
///@}

} // namespace Kratos.

#endif // KRATOS_UBLAS_COMPLEX_INTERFACE_H_INCLUDED defined
19 changes: 5 additions & 14 deletions kratos/includes/ublas_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,18 @@
// _|\_\_| \__,_|\__|\___/ ____/
// Multi-Physics
//
// License: BSD License
// Kratos default license: kratos/license.txt
// License: BSD License
// Kratos default license: kratos/license.txt
//
// Main authors: Pooyan Dadvand
//


#if !defined(KRATOS_UBLAS_INTERFACE_H_INCLUDED )
#define KRATOS_UBLAS_INTERFACE_H_INCLUDED

#pragma once

// System includes
#include <string>
#include <iostream>


// External includes
#include <boost/numeric/ublas/matrix.hpp>
#include <boost/numeric/ublas/vector.hpp>
Expand All @@ -41,7 +37,6 @@
// Project includes
#include "includes/define.h"


namespace Kratos
{

Expand Down Expand Up @@ -115,9 +110,5 @@ namespace Kratos
///@name Input and output
///@{

} // namespace Kratos.

#endif // KRATOS_UBLAS_INTERFACE_H_INCLUDED defined



///@}
} // namespace Kratos.
5 changes: 1 addition & 4 deletions kratos/includes/variables.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
// Main authors: Pooyan Dadvand
//

#if !defined(KRATOS_VARIABLES_H_INCLUDED )
#define KRATOS_VARIABLES_H_INCLUDED
#pragma once

// System includes
#include <string>
Expand Down Expand Up @@ -489,5 +488,3 @@ namespace Kratos

#undef KRATOS_EXPORT_MACRO
#define KRATOS_EXPORT_MACRO KRATOS_NO_EXPORT

#endif // KRATOS_VARIABLES_H_INCLUDED defined
Loading