Where possible moved redundent C header includes from headers to source files
This commit is contained in:
parent
97cd954c01
commit
315aeeb557
@ -139,8 +139,7 @@ IF (OSG_MAINTAINER)
|
||||
#
|
||||
# Provide target for generating ChangeLog
|
||||
#
|
||||
SET(SVN2LOG ~/bin/svn2log.py)
|
||||
SET(GENERATELOGS ${SVNCOMMAND} log -v --xml | python ${SVN2LOG} -L -H)
|
||||
SET(GENERATELOGS svn2cl)
|
||||
|
||||
ADD_CUSTOM_TARGET(ChangeLog
|
||||
COMMAND ${SVNCOMMAND} update
|
||||
|
@ -26,8 +26,7 @@
|
||||
#include <osg/GraphicsContext>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
||||
#include <string.h>
|
||||
|
||||
const std::string FILE_IDENTIFER("osgphotoalbum photo archive");
|
||||
|
||||
|
@ -31,6 +31,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <string.h>
|
||||
|
||||
class WindowCaptureCallback : public osg::Camera::DrawCallback
|
||||
{
|
||||
|
@ -15,20 +15,10 @@
|
||||
#define OSG_REFERENCED 1
|
||||
|
||||
// When building OSG with Java need to derive from Noodle::CBridgable class,
|
||||
// therefore so OSG_JAVA_BUILD must be defined. Also the thread-safe ref/unref test
|
||||
// as built in for the NoodleGlue wrapping. NoodleGlue has a Garbage collector mechanism
|
||||
// which is very similar to osg::DeletionManager. So these aspects of osg::Referenced
|
||||
// have been removed
|
||||
//#define OSG_JAVA_BUILD
|
||||
|
||||
#include <osg/Export>
|
||||
|
||||
#ifdef OSG_JAVA_BUILD
|
||||
#include <NoodleGlue/Bridgable.h>
|
||||
#else
|
||||
#include <OpenThreads/ScopedLock>
|
||||
#include <OpenThreads/Mutex>
|
||||
#endif
|
||||
|
||||
#include <OpenThreads/Atomic>
|
||||
#if !defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
|
||||
@ -37,7 +27,6 @@
|
||||
|
||||
namespace osg {
|
||||
|
||||
#ifndef OSG_JAVA_BUILD
|
||||
// forward declare, declared after Referenced below.
|
||||
class DeleteHandler;
|
||||
class Observer;
|
||||
@ -193,36 +182,6 @@ inline void Referenced::unref() const
|
||||
inline void intrusive_ptr_add_ref(Referenced* p) { p->ref(); }
|
||||
inline void intrusive_ptr_release(Referenced* p) { p->unref(); }
|
||||
|
||||
#else
|
||||
|
||||
/** Java wrappers use the CBridgable base-class for referencing
|
||||
* and garbage collection.
|
||||
*/
|
||||
class OSG_EXPORT Referenced : public NoodleGlue::CBridgable
|
||||
{
|
||||
public:
|
||||
/** Method not used in NoodleGlue referencing
|
||||
*/
|
||||
inline void unref_nodelete() const { --_refCount; }
|
||||
inline int referenceCount() const { return _refCount; }
|
||||
|
||||
/* These methods are not used in JavaOSG */
|
||||
void addObserver(Observer* observer) {}
|
||||
void removeObserver(Observer* observer) {}
|
||||
|
||||
public:
|
||||
|
||||
/** Set whether reference counting should be use a mutex to create thread reference counting.*/
|
||||
static void setThreadSafeReferenceCounting(bool enableThreadSafeReferenceCounting) {}
|
||||
|
||||
/** Get whether reference counting is active. */
|
||||
static bool getThreadSafeReferenceCounting() { return true; }
|
||||
|
||||
protected:
|
||||
virtual ~Referenced() {}
|
||||
};
|
||||
#endif //OSG_JAVA_BUILD
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -18,7 +18,6 @@
|
||||
#include <osgDB/Export>
|
||||
|
||||
#include <string>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
namespace std
|
||||
@ -30,14 +29,14 @@ typedef basic_string<wchar_t> wstring;
|
||||
namespace osgDB
|
||||
{
|
||||
|
||||
std::string OSGDB_EXPORT convertUTF16toUTF8(const wchar_t* source, unsigned sourceLength);
|
||||
std::wstring OSGDB_EXPORT convertUTF8toUTF16(const char* source, unsigned sourceLength);
|
||||
extern OSGDB_EXPORT std::string convertUTF16toUTF8(const wchar_t* source, unsigned sourceLength);
|
||||
extern OSGDB_EXPORT std::wstring convertUTF8toUTF16(const char* source, unsigned sourceLength);
|
||||
|
||||
inline std::string convertUTF16toUTF8(const std::wstring& s){return convertUTF16toUTF8(s.c_str(), s.length());}
|
||||
inline std::string convertUTF16toUTF8(const wchar_t* s){return convertUTF16toUTF8(s, wcslen(s));}
|
||||
extern OSGDB_EXPORT std::string convertUTF16toUTF8(const std::wstring& s);
|
||||
extern OSGDB_EXPORT std::string convertUTF16toUTF8(const wchar_t* s);
|
||||
|
||||
inline std::wstring convertUTF8toUTF16(const std::string& s){return convertUTF8toUTF16(s.c_str(), s.length());}
|
||||
inline std::wstring convertUTF8toUTF16(const char* s){return convertUTF8toUTF16(s, strlen(s));}
|
||||
extern OSGDB_EXPORT std::wstring convertUTF8toUTF16(const std::string& s);
|
||||
extern OSGDB_EXPORT std::wstring convertUTF8toUTF16(const char* s);
|
||||
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,6 @@
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
//#include <stdlib.h>
|
||||
|
||||
namespace osgDB {
|
||||
|
||||
|
@ -17,7 +17,6 @@
|
||||
#include <osgDB/Export>
|
||||
|
||||
#include <string>
|
||||
#include <stdlib.h>
|
||||
|
||||
namespace osgDB {
|
||||
|
||||
|
@ -16,9 +16,6 @@
|
||||
|
||||
#include <osgDB/Export>
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <istream>
|
||||
|
||||
namespace osgDB {
|
||||
|
@ -20,8 +20,6 @@
|
||||
#include <deque>
|
||||
#include <string>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
namespace osgDB {
|
||||
|
||||
enum CaseSensitivity
|
||||
|
@ -14,9 +14,7 @@
|
||||
#ifndef OSGSIM_SHAPEATTRIBUTE
|
||||
#define OSGSIM_SHAPEATTRIBUTE 1
|
||||
|
||||
|
||||
#include <string>
|
||||
#include <string.h>
|
||||
#include <vector>
|
||||
|
||||
#include <osg/Object>
|
||||
@ -63,7 +61,7 @@ class OSGSIM_EXPORT ShapeAttribute
|
||||
|
||||
void setValue(int value) { free(); _type = INTEGER; _integer = value; }
|
||||
void setValue(double value) { free(); _type = DOUBLE; _double = value; }
|
||||
void setValue(const char * value) { free(); _type = STRING; _string = (value ? strdup(value) : 0); }
|
||||
void setValue(const char * value);
|
||||
|
||||
/** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
|
||||
int compare(const osgSim::ShapeAttribute& sa) const;
|
||||
|
@ -26,8 +26,6 @@
|
||||
|
||||
#include <osg/DeleteHandler>
|
||||
|
||||
#ifndef OSG_JAVA_BUILD
|
||||
|
||||
namespace osg
|
||||
{
|
||||
|
||||
@ -368,5 +366,3 @@ void Referenced::deleteUsingDeleteHandler() const
|
||||
}
|
||||
|
||||
} // end of namespace osg
|
||||
|
||||
#endif //OSG_JAVA_BUILD
|
||||
|
@ -14,6 +14,8 @@
|
||||
#include <osgDB/ConvertUTF>
|
||||
#include <osg/Notify>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
@ -22,6 +24,12 @@
|
||||
namespace osgDB
|
||||
{
|
||||
|
||||
std::string convertUTF16toUTF8(const std::wstring& s){return convertUTF16toUTF8(s.c_str(), s.length());}
|
||||
std::string convertUTF16toUTF8(const wchar_t* s){return convertUTF16toUTF8(s, wcslen(s));}
|
||||
|
||||
std::wstring convertUTF8toUTF16(const std::string& s){return convertUTF8toUTF16(s.c_str(), s.length());}
|
||||
std::wstring convertUTF8toUTF16(const char* s){return convertUTF8toUTF16(s, strlen(s));}
|
||||
|
||||
std::string convertUTF16toUTF8(const wchar_t* source, unsigned sourceLength)
|
||||
{
|
||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||
|
@ -30,6 +30,8 @@
|
||||
#include <functional>
|
||||
#include <set>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#else
|
||||
|
@ -10,13 +10,15 @@
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
#include <string.h>
|
||||
|
||||
#include <osg/Notify>
|
||||
#include <osg/Math>
|
||||
|
||||
#include <osgDB/Field>
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
using namespace osgDB;
|
||||
using namespace std;
|
||||
|
||||
|
@ -74,6 +74,8 @@
|
||||
#include <osgDB/Registry>
|
||||
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <stack>
|
||||
|
||||
namespace osgDB
|
||||
|
@ -18,6 +18,7 @@
|
||||
|
||||
#include <sstream>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
using namespace std;
|
||||
using namespace osgDB;
|
||||
|
@ -9,6 +9,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
using namespace osg;
|
||||
|
@ -16,6 +16,8 @@
|
||||
#include <assert.h>
|
||||
#include <fstream>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "Q3BSPReader.h"
|
||||
#include "Q3BSPLoad.h"
|
||||
|
||||
|
@ -14,7 +14,9 @@
|
||||
#include <osgDB/FileUtils>
|
||||
#include <osgDB/ReadFile>
|
||||
#include <osg/io_utils>
|
||||
|
||||
#include <iostream>
|
||||
#include <string.h>
|
||||
|
||||
#include "VBSPReader.h"
|
||||
#include "VBSPGeometry.h"
|
||||
|
@ -27,6 +27,7 @@
|
||||
|
||||
#include <iomanip>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
// NOTICE ON WIN32:
|
||||
|
@ -16,6 +16,8 @@ AUTHOR: Geoff Michel
|
||||
#ifndef _GEO_STRUCTS_H_
|
||||
#define _GEO_STRUCTS_H_ 1
|
||||
|
||||
#include <string.h>
|
||||
|
||||
typedef std::vector< geoExtensionDefRec > geoExtensionDefList;
|
||||
|
||||
class geoField { // holds one field of data as read from the disk of a GEO file
|
||||
|
@ -37,6 +37,8 @@
|
||||
#include <osgUtil/SmoothingVisitor>
|
||||
#include <osgUtil/Tessellator>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "Converter.h"
|
||||
#include "VertexMap.h"
|
||||
|
||||
|
@ -37,6 +37,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <string.h>
|
||||
|
||||
#include "old_Lwo2.h"
|
||||
#include "old_Lwo2Layer.h"
|
||||
|
@ -24,6 +24,8 @@
|
||||
#include <osgDB/FileUtils>
|
||||
#include <osgDB/FileNameUtils>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace obj;
|
||||
|
||||
static std::string strip( const std::string& ss )
|
||||
|
@ -4,6 +4,8 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -4,6 +4,8 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -4,6 +4,8 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -8,6 +8,8 @@
|
||||
|
||||
#include "Matrix.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -4,6 +4,8 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -4,6 +4,10 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -9,6 +9,8 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -6,6 +6,8 @@
|
||||
#include <osgDB/Input>
|
||||
#include <osgDB/ParameterOutput>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -4,6 +4,8 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include <osgDB/Output>
|
||||
|
||||
#include <set>
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
@ -4,6 +4,8 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
using namespace std;
|
||||
|
@ -5,6 +5,8 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -5,6 +5,8 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -9,6 +9,8 @@
|
||||
#include "osgDB/Input"
|
||||
#include "osgDB/Output"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -6,6 +6,8 @@
|
||||
#include <osgDB/Input>
|
||||
#include <osgDB/Output>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
using namespace osgDB;
|
||||
|
||||
|
@ -13,6 +13,8 @@
|
||||
#include <osgDB/Output>
|
||||
#include <osgDB/ParameterOutput>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
bool Layer_readLocalData(osg::Object &obj, osgDB::Input &fr);
|
||||
bool Layer_writeLocalData(const osg::Object &obj, osgDB::Output &fw);
|
||||
bool Layer_matchFilterStr(const char* str, osg::Texture::FilterMode& filter);
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include <osgDB/fstream>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
using namespace osg;
|
||||
template <class T>
|
||||
|
@ -40,6 +40,8 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
/**
|
||||
* STL importer for OpenSceneGraph.
|
||||
*/
|
||||
|
@ -7,8 +7,10 @@
|
||||
#include <osgDB/Registry>
|
||||
#include <osgDB/FileUtils>
|
||||
#include <osg/io_utils>
|
||||
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <string.h>
|
||||
|
||||
#include "ReaderWriterTXP.h"
|
||||
#include "TXPNode.h"
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include<deque>
|
||||
#include<algorithm>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using namespace osgShadow;
|
||||
|
||||
|
@ -13,6 +13,7 @@
|
||||
|
||||
#include <memory.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <osgSim/ShapeAttribute>
|
||||
|
||||
@ -68,6 +69,13 @@ void ShapeAttribute::free()
|
||||
}
|
||||
}
|
||||
|
||||
void ShapeAttribute::setValue(const char * value)
|
||||
{
|
||||
free();
|
||||
_type = STRING;
|
||||
_string = (value ? strdup(value) : 0);
|
||||
}
|
||||
|
||||
void ShapeAttribute::copy(const ShapeAttribute& sa)
|
||||
{
|
||||
_name = sa._name;
|
||||
|
@ -23,6 +23,8 @@
|
||||
#include <osgDB/FileNameUtils>
|
||||
#include <osg/GLU>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <OpenThreads/ReentrantMutex>
|
||||
|
||||
using namespace osgText;
|
||||
|
@ -18,6 +18,8 @@
|
||||
#include <osgViewer/Viewer>
|
||||
#include <osgViewer/ViewerEventHandlers>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
namespace osgViewer
|
||||
{
|
||||
|
||||
|
@ -25,8 +25,8 @@
|
||||
#include <osgViewer/Renderer>
|
||||
#include <osgViewer/CompositeViewer>
|
||||
|
||||
|
||||
#include <sstream>
|
||||
#include <string.h>
|
||||
|
||||
using namespace osgViewer;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user