mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-30 12:32:36 +00:00
Changed standard C lib includes to C++ format
This commit is contained in:
parent
0549e949ba
commit
a021165d9f
@ -11,7 +11,7 @@
|
|||||||
// For OutputDebugString
|
// For OutputDebugString
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
// makes __argc and __argv available on windows
|
// makes __argc and __argv available on windows
|
||||||
#include <stdlib.h>
|
#include <cstdlib>
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -24,8 +24,8 @@
|
|||||||
#include "bsa_file.hpp"
|
#include "bsa_file.hpp"
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <stdlib.h>
|
#include <cstdlib>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
#include <OgreDataStream.h>
|
#include <OgreDataStream.h>
|
||||||
|
|
||||||
|
@ -13,8 +13,8 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <cstdio>
|
||||||
#include <stdlib.h>
|
#include <cstdlib>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#ifndef FIX_UNUSED
|
#ifndef FIX_UNUSED
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h> /* for FILE */
|
#include <cstdio> /* for FILE */
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
#include "../stringops.hpp"
|
#include "../stringops.hpp"
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ http://www.gnu.org/licenses/ .
|
|||||||
|
|
||||||
#include "bullet_nif_loader.hpp"
|
#include "bullet_nif_loader.hpp"
|
||||||
#include <Ogre.h>
|
#include <Ogre.h>
|
||||||
#include <stdio.h>
|
#include <cstdio>
|
||||||
|
|
||||||
#include "../nif/nif_file.hpp"
|
#include "../nif/nif_file.hpp"
|
||||||
#include "../nif/node.hpp"
|
#include "../nif/node.hpp"
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#include "heightmap.hpp"
|
#include "heightmap.hpp"
|
||||||
#include "land_factory.hpp"
|
#include "land_factory.hpp"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
namespace Terrain
|
namespace Terrain
|
||||||
{
|
{
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
terrains of the same size, once instance can usually be shared.
|
terrains of the same size, once instance can usually be shared.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
namespace Terrain
|
namespace Terrain
|
||||||
{
|
{
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
void tab() { cout << " "; }
|
void tab() { cout << " "; }
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "to_utf8.hpp"
|
#include "to_utf8.hpp"
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
/* This file contains the code to translate from WINDOWS-1252 (native
|
/* This file contains the code to translate from WINDOWS-1252 (native
|
||||||
charset used in English version of Morrowind) to UTF-8. The library
|
charset used in English version of Morrowind) to UTF-8. The library
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "ois_driver.hpp"
|
#include "ois_driver.hpp"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <OgreRenderWindow.h>
|
#include <OgreRenderWindow.h>
|
||||||
#include <OIS/OIS.h>
|
#include <OIS/OIS.h>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <SDL_image.h>
|
#include <SDL_image.h>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
using namespace Mangle::Rend2D;
|
using namespace Mangle::Rend2D;
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include <SDL_image.h>
|
#include <SDL_image.h>
|
||||||
#include <SDL_opengl.h>
|
#include <SDL_opengl.h>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
using namespace Mangle::Rend2D;
|
using namespace Mangle::Rend2D;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include <MyGUI.h>
|
#include <MyGUI.h>
|
||||||
#include <OIS/OIS.h>
|
#include <OIS/OIS.h>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
#include "events.hpp"
|
#include "events.hpp"
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include <MyGUI.h>
|
#include <MyGUI.h>
|
||||||
#include <MyGUI_OgrePlatform.h>
|
#include <MyGUI_OgrePlatform.h>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
#include "manager.hpp"
|
#include "manager.hpp"
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
namespace OEngine {
|
namespace OEngine {
|
||||||
namespace Input {
|
namespace Input {
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <boost/function.hpp>
|
#include <boost/function.hpp>
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
namespace OEngine {
|
namespace OEngine {
|
||||||
namespace Input {
|
namespace Input {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef MISC_LIST_H
|
#ifndef MISC_LIST_H
|
||||||
#define MISC_LIST_H
|
#define MISC_LIST_H
|
||||||
|
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
|
|
||||||
namespace Misc{
|
namespace Misc{
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#include "OgreTexture.h"
|
#include "OgreTexture.h"
|
||||||
#include "OgreHardwarePixelBuffer.h"
|
#include "OgreHardwarePixelBuffer.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <cassert>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
using namespace Ogre;
|
using namespace Ogre;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user