jpt-archive/cpp_photon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.h->.hpp

Browse Source
This commit is contained in:
James Turk 2005-02-13 22:12:02 +00:00
parent 6543619be1
commit 0fbc3adfce
21 changed files with 248 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devcpp/photon.dev
View File

@ -30,7 +30,7 @@ CompilerSet=0
CompilerSettings=0000001000000000000000 CompilerSettings=0000001000000000000000
[Unit1] [Unit1]
FileName=..\include\types.h FileName=..\include\types.hpp
CompileCpp=1 CompileCpp=1
Folder=include Folder=include
Compile=1 Compile=1
@ -40,7 +40,7 @@ OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit2] [Unit2]
FileName=..\include\Log.h FileName=..\include\Log.hpp
CompileCpp=1 CompileCpp=1
Folder=include Folder=include
Compile=1 Compile=1
@ -50,7 +50,7 @@ OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit3] [Unit3]
FileName=..\include\LogSink.h FileName=..\include\LogSink.hpp
CompileCpp=1 CompileCpp=1
Folder=include Folder=include
Compile=1 Compile=1
@ -60,7 +60,7 @@ OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit4] [Unit4]
FileName=..\include\util\ConfigFile.h FileName=..\include\util\ConfigFile.hpp
CompileCpp=1 CompileCpp=1
Folder=include/util Folder=include/util
Compile=1 Compile=1
@ -70,7 +70,7 @@ OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit5] [Unit5]
FileName=..\include\util\RandGen.h FileName=..\include\util\RandGen.hpp
CompileCpp=1 CompileCpp=1
Folder=include/util Folder=include/util
Compile=1 Compile=1
@ -80,7 +80,7 @@ OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit6] [Unit6]
FileName=..\include\util\VersionInfo.h FileName=..\include\util\VersionInfo.hpp
CompileCpp=1 CompileCpp=1
Folder=include/util Folder=include/util
Compile=1 Compile=1
@ -130,7 +130,7 @@ OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit13] [Unit13]
FileName=..\include\exceptions.h FileName=..\include\exceptions.hpp
CompileCpp=1 CompileCpp=1
Folder=include Folder=include
Compile=1 Compile=1
@ -158,7 +158,7 @@ ProductVersion=
AutoIncBuildNr=0 AutoIncBuildNr=0
[Unit14] [Unit14]
FileName=..\include\util\FileBuffer.h FileName=..\include\util\FileBuffer.hpp
CompileCpp=1 CompileCpp=1
Folder=include/util Folder=include/util
Compile=1 Compile=1
@ -198,7 +198,7 @@ OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit17] [Unit17]
FileName=..\include\util\filesys\filesys.h FileName=..\include\util\filesys\filesys.hpp
CompileCpp=1 CompileCpp=1
Folder=include/util Folder=include/util
Compile=1 Compile=1
@ -218,7 +218,7 @@ OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit18] [Unit18]
FileName=..\include\Application.h FileName=..\include\Application.hpp
CompileCpp=1 CompileCpp=1
Folder=include Folder=include
Compile=1 Compile=1
@ -238,7 +238,7 @@ OverrideBuildCmd=0
BuildCmd= BuildCmd=
[Unit20] [Unit20]
FileName=..\include\entrypoint.h FileName=..\include\entrypoint.hpp
CompileCpp=1 CompileCpp=1
Folder=include Folder=include
Compile=1 Compile=1

45
include/Application.h → include/Application.hpp
View File

@ -5,21 +5,27 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: Application.h,v 1.1 2005/02/07 02:00:48 cozman Exp $ // $Id: Application.hpp,v 1.1 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: Application.h,v $ // $Log: Application.hpp,v $
// Revision 1.1 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.1 2005/02/07 02:00:48 cozman // Revision 1.1 2005/02/07 02:00:48 cozman
// Application re-integrated // Application re-integrated
// //
// //
#ifndef PHOTON_APPLICATION_H #ifndef PHOTON_APPLICATION_HPP
#define PHOTON_APPLICATION_H #define PHOTON_APPLICATION_HPP
#include <vector> #include <vector>
#include <string> #include <string>
#include "types.hpp"
#include "util/VersionInfo.hpp"
namespace photon namespace photon
{ {
@ -56,8 +62,37 @@ public:
// See Also: // See Also:
// <ENTRYPOINT> // <ENTRYPOINT>
virtual int main(StrVec args)=0; virtual int main(StrVec args)=0;
// Group: API Initialization
private:
// Function: ensureVersion
// Checks a version of a library against the required version, throws
// an APIError if the version is not met.
//
// Parameters:
// library - Name of library being initialized.
// version - Version of library being used.
// required - Required version of library.
void ensureVersion(const std::string& library,
const util::VersionInfo& version,
const util::VersionInfo& required);
// Function: initPhysFS
// Initialize PhysFS for use.
//
// Parameters:
// arg0 - Path to application (argv[0])
util::VersionInfo initPhysFS(const char* arg0);
// Function: initGLFW
// Initialize GLFW for use.
util::VersionInfo initGLFW();
// VersionInfos
private:
util::VersionInfo photonVer;
}; };
} }
#endif //PHOTON_APPLICATION_H #endif //PHOTON_APPLICATION_HPP

15
include/Log.h → include/Log.hpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: Log.h,v 1.3 2005/02/07 01:48:26 cozman Exp $ // $Id: Log.hpp,v 1.1 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: Log.h,v $ // $Log: Log.hpp,v $
// Revision 1.1 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.3 2005/02/07 01:48:26 cozman // Revision 1.3 2005/02/07 01:48:26 cozman
// string references // string references
// //
@ -20,14 +23,14 @@
// //
// //
#ifndef PHOTON_LOG_H #ifndef PHOTON_LOG_HPP
#define PHOTON_LOG_H #define PHOTON_LOG_HPP
#include <string> #include <string>
#include <list> #include <list>
#include <sstream> #include <sstream>
#include "LogSink.h" #include "LogSink.hpp"
namespace photon namespace photon
{ {
@ -134,4 +137,4 @@ extern Log log;
} }
#endif //PHOTON_LOG_H #endif //PHOTON_LOG_HPP

15
include/LogSink.h → include/LogSink.hpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: LogSink.h,v 1.5 2005/02/07 01:48:26 cozman Exp $ // $Id: LogSink.hpp,v 1.1 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: LogSink.h,v $ // $Log: LogSink.hpp,v $
// Revision 1.1 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.5 2005/02/07 01:48:26 cozman // Revision 1.5 2005/02/07 01:48:26 cozman
// string references // string references
// //
@ -26,13 +29,13 @@
// //
// //
#ifndef PHOTON_LOGSINK_H #ifndef PHOTON_LOGSINK_HPP
#define PHOTON_LOGSINK_H #define PHOTON_LOGSINK_HPP
#include <string> #include <string>
#include <fstream> #include <fstream>
#include "types.h" #include "types.hpp"
namespace photon namespace photon
{ {
@ -178,4 +181,4 @@ private:
} }
#endif //PHOTON_LOGSINK_H #endif //PHOTON_LOGSINK_HPP

15
include/entrypoint.h → include/entrypoint.hpp
View File

@ -5,20 +5,23 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: entrypoint.h,v 1.1 2005/02/07 02:00:48 cozman Exp $ // $Id: entrypoint.hpp,v 1.1 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: entrypoint.h,v $ // $Log: entrypoint.hpp,v $
// Revision 1.1 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.1 2005/02/07 02:00:48 cozman // Revision 1.1 2005/02/07 02:00:48 cozman
// Application re-integrated // Application re-integrated
// //
// //
#ifndef PHOTON_ENTRYPOINT_H #ifndef PHOTON_ENTRYPOINT_HPP
#define PHOTON_ENTRYPOINT_H #define PHOTON_ENTRYPOINT_HPP
#include "Log.h" #include "Log.hpp"
/* Title: Entrypoint */ /* Title: Entrypoint */
@ -61,4 +64,4 @@ int mainclass(int argc, char *argv[])
} }
#endif //PHOTON_ENTRYPOINT_H #endif //PHOTON_ENTRYPOINT_HPP

15
include/exceptions.h → include/exceptions.hpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: exceptions.h,v 1.5 2005/02/07 01:48:26 cozman Exp $ // $Id: exceptions.hpp,v 1.1 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: exceptions.h,v $ // $Log: exceptions.hpp,v $
// Revision 1.1 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.5 2005/02/07 01:48:26 cozman // Revision 1.5 2005/02/07 01:48:26 cozman
// string references // string references
// //
@ -26,10 +29,10 @@
// //
// //
#ifndef PHOTON_EXCEPTIONS_H #ifndef PHOTON_EXCEPTIONS_HPP
#define PHOTON_EXCEPTIONS_H #define PHOTON_EXCEPTIONS_HPP
#include "types.h" #include "types.hpp"
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <ostream> #include <ostream>
@ -256,4 +259,4 @@ public:
} }
#endif //PHOTON_EXCEPTIONS_H #endif //PHOTON_EXCEPTIONS_HPP

13
include/types.h → include/types.hpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: types.h,v 1.3 2005/02/07 01:48:26 cozman Exp $ // $Id: types.hpp,v 1.1 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: types.h,v $ // $Log: types.hpp,v $
// Revision 1.1 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.3 2005/02/07 01:48:26 cozman // Revision 1.3 2005/02/07 01:48:26 cozman
// string references // string references
// //
@ -20,8 +23,8 @@
// //
// //
#ifndef PHOTON_TYPES_H #ifndef PHOTON_TYPES_HPP
#define PHOTON_TYPES_H #define PHOTON_TYPES_HPP
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
@ -56,4 +59,4 @@ namespace photon {
} }
#endif //PHOTON_TYPES_H #endif //PHOTON_TYPES_HPP

13
include/util/ConfigFile.h → include/util/ConfigFile.hpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: ConfigFile.h,v 1.4 2005/02/05 03:00:41 cozman Exp $ // $Id: ConfigFile.hpp,v 1.1 2005/02/13 22:12:04 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: ConfigFile.h,v $ // $Log: ConfigFile.hpp,v $
// Revision 1.1 2005/02/13 22:12:04 cozman
// .h->.hpp
//
// Revision 1.4 2005/02/05 03:00:41 cozman // Revision 1.4 2005/02/05 03:00:41 cozman
// fixed binary_function // fixed binary_function
// //
@ -23,8 +26,8 @@
// //
// //
#ifndef PHOTON_UTIL_CONFIGFILE_H #ifndef PHOTON_UTIL_CONFIGFILE_HPP
#define PHOTON_UTIL_CONFIGFILE_H #define PHOTON_UTIL_CONFIGFILE_HPP
#include <string> #include <string>
#include <list> #include <list>
@ -247,4 +250,4 @@ ConfigFile::getVariable(const std::string& sec,
} }
} }
#endif //PHOTON_UTIL_CONFIGFILE_H #endif //PHOTON_UTIL_CONFIGFILE_HPP

15
include/util/FileBuffer.h → include/util/FileBuffer.hpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: FileBuffer.h,v 1.2 2005/02/07 01:48:26 cozman Exp $ // $Id: FileBuffer.hpp,v 1.1 2005/02/13 22:12:04 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: FileBuffer.h,v $ // $Log: FileBuffer.hpp,v $
// Revision 1.1 2005/02/13 22:12:04 cozman
// .h->.hpp
//
// Revision 1.2 2005/02/07 01:48:26 cozman // Revision 1.2 2005/02/07 01:48:26 cozman
// string references // string references
// //
@ -17,10 +20,10 @@
// //
// //
#ifndef PHOTON_UTIL_FILEBUFFER_H #ifndef PHOTON_UTIL_FILEBUFFER_HPP
#define PHOTON_UTIL_FILEBUFFER_H #define PHOTON_UTIL_FILEBUFFER_HPP
#include "types.h" #include "types.hpp"
#include "physfs.h" #include "physfs.h"
@ -120,4 +123,4 @@ private:
} }
} }
#endif //PHOTON_UTIL_FILEBUFFER_H #endif //PHOTON_UTIL_FILEBUFFER_HPP

13
include/util/RandGen.h → include/util/RandGen.hpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: RandGen.h,v 1.2 2005/02/04 21:56:39 cozman Exp $ // $Id: RandGen.hpp,v 1.1 2005/02/13 22:12:04 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: RandGen.h,v $ // $Log: RandGen.hpp,v $
// Revision 1.1 2005/02/13 22:12:04 cozman
// .h->.hpp
//
// Revision 1.2 2005/02/04 21:56:39 cozman // Revision 1.2 2005/02/04 21:56:39 cozman
// RandGen implemented/tested // RandGen implemented/tested
// //
@ -17,8 +20,8 @@
// //
// //
#ifndef PHOTON_UTIL_RANDGEN_H #ifndef PHOTON_UTIL_RANDGEN_HPP
#define PHOTON_UTIL_RANDGEN_H #define PHOTON_UTIL_RANDGEN_HPP
namespace photon { namespace photon {
namespace util { namespace util {
@ -121,4 +124,4 @@ private: //state data
} }
} }
#endif //PHOTON_UTIL_RANDGEN_H #endif //PHOTON_UTIL_RANDGEN_HPP

30
include/util/VersionInfo.h → include/util/VersionInfo.hpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: VersionInfo.h,v 1.3 2005/02/07 01:48:26 cozman Exp $ // $Id: VersionInfo.hpp,v 1.1 2005/02/13 22:12:04 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: VersionInfo.h,v $ // $Log: VersionInfo.hpp,v $
// Revision 1.1 2005/02/13 22:12:04 cozman
// .h->.hpp
//
// Revision 1.3 2005/02/07 01:48:26 cozman // Revision 1.3 2005/02/07 01:48:26 cozman
// string references // string references
// //
@ -20,8 +23,8 @@
// //
// //
#ifndef PHOTON_UTIL_VERSIONINFO_H #ifndef PHOTON_UTIL_VERSIONINFO_HPP
#define PHOTON_UTIL_VERSIONINFO_H #define PHOTON_UTIL_VERSIONINFO_HPP
#include <string> #include <string>
#include <ostream> #include <ostream>
@ -54,10 +57,10 @@ public:
// added/removed/changed. // added/removed/changed.
unsigned int minor; unsigned int minor;
// Variable: release // Variable: patch
// Release number, should be changed upon every release that isn't // Patch number, should be changed upon every release that isn't
// signifigant enough to reflect a change in the minor versioning number. // signifigant enough to reflect a change in the minor versioning number.
unsigned int release; unsigned int patch;
// Variable: extra // Variable: extra
// String for holding extra data, such as a release name or special tag. // String for holding extra data, such as a release name or special tag.
@ -66,15 +69,18 @@ public:
// Group: (Con/De)structors // Group: (Con/De)structors
// Function: VersionInfo // Function: VersionInfo
// Initializing constructor, VersionInfo must be initalized with this // Default constructor.
// constructor. VersionInfo();
// Function: VersionInfo
// Initializing constructor.
// //
// Parameters: // Parameters:
// maj - Major version number. // maj - Major version number.
// min - Minor version number. // min - Minor version number.
// rel - Release number. // pat - Patch number.
// ext - Extra info string. [default: ""] // ext - Extra info string. [default: ""]
VersionInfo(unsigned int maj, unsigned int min, unsigned int rel, VersionInfo(unsigned int maj, unsigned int min, unsigned int pat,
std::string ext=""); std::string ext="");
//operators //operators
@ -91,4 +97,4 @@ public:
} }
} }
#endif //PHOTON_UTIL_VERSIONINFO_H #endif //PHOTON_UTIL_VERSIONINFO_HPP

15
include/util/filesys/filesys.h → include/util/filesys/filesys.hpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: filesys.h,v 1.2 2005/02/07 01:48:50 cozman Exp $ // $Id: filesys.hpp,v 1.1 2005/02/13 22:12:04 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: filesys.h,v $ // $Log: filesys.hpp,v $
// Revision 1.1 2005/02/13 22:12:04 cozman
// .h->.hpp
//
// Revision 1.2 2005/02/07 01:48:50 cozman // Revision 1.2 2005/02/07 01:48:50 cozman
// fixed several issues in testing // fixed several issues in testing
// //
@ -17,10 +20,10 @@
// //
// //
#ifndef PHOTON_UTIL_FILESYS_FILESYS_H #ifndef PHOTON_UTIL_FILESYS_FILESYS_HPP
#define PHOTON_UTIL_FILESYS_FILESYS_H #define PHOTON_UTIL_FILESYS_FILESYS_HPP
#include "exceptions.h" #include "exceptions.hpp"
#include "physfs.h" #include "physfs.h"
@ -213,4 +216,4 @@ PHYSFS_sint64 getModTime(const std::string& item);
} }
} }
#endif //PHOTON_UTIL_FILESYS_FILESYS_H #endif //PHOTON_UTIL_FILESYS_FILESYS_HPP

52
src/Application.cpp
View File

@ -5,31 +5,75 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: Application.cpp,v 1.1 2005/02/07 02:00:49 cozman Exp $ // $Id: Application.cpp,v 1.2 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: Application.cpp,v $ // $Log: Application.cpp,v $
// Revision 1.2 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.1 2005/02/07 02:00:49 cozman // Revision 1.1 2005/02/07 02:00:49 cozman
// Application re-integrated // Application re-integrated
// //
// //
#include "Application.h" #include "Application.hpp"
#include "exceptions.hpp"
#include "physfs.h" #include "physfs.h"
#include "glfw.h"
#include <sstream>
namespace photon namespace photon
{ {
Application::Application(const char* arg0) Application::Application(const char* arg0) :
photonVer(0,0,1) // this is the current version
{ {
PHYSFS_init(arg0); //init PhysFS util::VersionInfo physfsReq(1,0,0); // requires PhysFS 1.0.0
util::VersionInfo glfwReq(2,4,2); // requires GLFW 2.4.2
ensureVersion("PhysFS", initPhysFS(arg0), physfsReq);
ensureVersion("GLFW", initGLFW(), glfwReq);
} }
Application::~Application() Application::~Application()
{ {
PHYSFS_deinit(); //shutdown PhysFS PHYSFS_deinit(); //shutdown PhysFS
glfwTerminate(); //shutdown GLFW
}
void Application::ensureVersion(const std::string& library,
const util::VersionInfo& version,
const util::VersionInfo& required)
{
std::stringstream ss;
if(version < required)
{
ss << library << " version " << required << " required; " <<
version << "used, please update.";
throw APIError(ss.str());
}
}
util::VersionInfo Application::initPhysFS(const char* arg0)
{
PHYSFS_Version ver;
PHYSFS_init(arg0);
PHYSFS_addToSearchPath(arg0,0);
PHYSFS_getLinkedVersion(&ver);
return util::VersionInfo(ver.major, ver.minor, ver.patch);
}
util::VersionInfo Application::initGLFW()
{
int maj,min,patch;
glfwInit();
glfwGetVersion(&maj,&min,&patch);
return util::VersionInfo(maj,min,patch);
} }
} }

9
src/Log.cpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: Log.cpp,v 1.3 2005/02/07 01:48:27 cozman Exp $ // $Id: Log.cpp,v 1.4 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: Log.cpp,v $ // $Log: Log.cpp,v $
// Revision 1.4 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.3 2005/02/07 01:48:27 cozman // Revision 1.3 2005/02/07 01:48:27 cozman
// string references // string references
// //
@ -20,10 +23,10 @@
// //
// //
#include "Log.h" #include "Log.hpp"
#include <algorithm> #include <algorithm>
#include "exceptions.h" #include "exceptions.hpp"
namespace photon namespace photon
{ {

7
src/LogSink.cpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: LogSink.cpp,v 1.5 2005/02/07 01:48:27 cozman Exp $ // $Id: LogSink.cpp,v 1.6 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: LogSink.cpp,v $ // $Log: LogSink.cpp,v $
// Revision 1.6 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.5 2005/02/07 01:48:27 cozman // Revision 1.5 2005/02/07 01:48:27 cozman
// string references // string references
// //
@ -26,7 +29,7 @@
// //
// //
#include "LogSink.h" #include "LogSink.hpp"
#include <iostream> #include <iostream>

7
src/exceptions.cpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: exceptions.cpp,v 1.3 2005/02/07 01:48:27 cozman Exp $ // $Id: exceptions.cpp,v 1.4 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: exceptions.cpp,v $ // $Log: exceptions.cpp,v $
// Revision 1.4 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.3 2005/02/07 01:48:27 cozman // Revision 1.3 2005/02/07 01:48:27 cozman
// string references // string references
// //
@ -21,7 +24,7 @@
// //
#include "exceptions.h" #include "exceptions.hpp"
namespace photon namespace photon

9
src/util/ConfigFile.cpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: ConfigFile.cpp,v 1.2 2005/01/31 15:44:13 cozman Exp $ // $Id: ConfigFile.cpp,v 1.3 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: ConfigFile.cpp,v $ // $Log: ConfigFile.cpp,v $
// Revision 1.3 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.2 2005/01/31 15:44:13 cozman // Revision 1.2 2005/01/31 15:44:13 cozman
// ConfigFile rewrite // ConfigFile rewrite
// //
@ -17,8 +20,8 @@
// //
// //
#include "util/ConfigFile.h" #include "util/ConfigFile.hpp"
#include "exceptions.h" #include "exceptions.hpp"
#include <cctype> #include <cctype>
#include <fstream> #include <fstream>

9
src/util/FileBuffer.cpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: FileBuffer.cpp,v 1.2 2005/02/07 01:48:27 cozman Exp $ // $Id: FileBuffer.cpp,v 1.3 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: FileBuffer.cpp,v $ // $Log: FileBuffer.cpp,v $
// Revision 1.3 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.2 2005/02/07 01:48:27 cozman // Revision 1.2 2005/02/07 01:48:27 cozman
// string references // string references
// //
@ -17,9 +20,9 @@
// //
// //
#include "util/FileBuffer.h" #include "util/FileBuffer.hpp"
#include "exceptions.h" #include "exceptions.hpp"
namespace photon namespace photon
{ {

7
src/util/RandGen.cpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: RandGen.cpp,v 1.2 2005/02/04 21:56:40 cozman Exp $ // $Id: RandGen.cpp,v 1.3 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: RandGen.cpp,v $ // $Log: RandGen.cpp,v $
// Revision 1.3 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.2 2005/02/04 21:56:40 cozman // Revision 1.2 2005/02/04 21:56:40 cozman
// RandGen implemented/tested // RandGen implemented/tested
// //
@ -64,7 +67,7 @@
//http://www.math.keio.ac.jp/matumoto/emt.html //http://www.math.keio.ac.jp/matumoto/emt.html
//email: matumoto@math.keio.ac.jp //email: matumoto@math.keio.ac.jp
#include "util/RandGen.h" #include "util/RandGen.hpp"
#include <ctime> #include <ctime>
namespace photon { namespace photon {

24
src/util/VersionInfo.cpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: VersionInfo.cpp,v 1.2 2005/02/05 02:57:07 cozman Exp $ // $Id: VersionInfo.cpp,v 1.3 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: VersionInfo.cpp,v $ // $Log: VersionInfo.cpp,v $
// Revision 1.3 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.2 2005/02/05 02:57:07 cozman // Revision 1.2 2005/02/05 02:57:07 cozman
// *** empty log message *** // *** empty log message ***
// //
@ -17,16 +20,19 @@
// //
// //
#include "util/VersionInfo.h" #include "util/VersionInfo.hpp"
namespace photon { namespace photon {
namespace util { namespace util {
VersionInfo::VersionInfo(unsigned int maj, unsigned int min, unsigned int rel, VersionInfo::VersionInfo(unsigned int maj, unsigned int min, unsigned int pat,
std::string ext) : std::string ext) :
major(maj), minor(min), release(rel), extra(ext) major(maj), minor(min), patch(pat), extra(ext)
{ {}
}
VersionInfo::VersionInfo() :
major(0), minor(0), patch(0)
{}
bool VersionInfo::operator<(const VersionInfo &rhs) const bool VersionInfo::operator<(const VersionInfo &rhs) const
{ {
@ -39,7 +45,7 @@ bool VersionInfo::operator<(const VersionInfo &rhs) const
return true; return true;
else if(this->minor == rhs.minor) else if(this->minor == rhs.minor)
{ {
if(this->release < rhs.release) if(this->patch < rhs.patch)
return true; return true;
} }
} }
@ -53,7 +59,7 @@ bool VersionInfo::operator<=(const VersionInfo &rhs) const
bool VersionInfo::operator==(const VersionInfo &rhs) const bool VersionInfo::operator==(const VersionInfo &rhs) const
{ {
return this->extra == rhs.extra && this->release == rhs.release && return this->extra == rhs.extra && this->patch == rhs.patch &&
this->minor == rhs.minor && this->major == rhs.major; this->minor == rhs.minor && this->major == rhs.major;
} }
@ -69,7 +75,7 @@ bool VersionInfo::operator>(const VersionInfo &rhs) const
std::ostream& operator<<(std::ostream &o, const VersionInfo &rhs) std::ostream& operator<<(std::ostream &o, const VersionInfo &rhs)
{ {
return o << rhs.major << '.' << rhs.minor << '.' << rhs.release << return o << rhs.major << '.' << rhs.minor << '.' << rhs.patch <<
" [" << rhs.extra << "]"; " [" << rhs.extra << "]";
} }

7
src/util/filesys/filesys.cpp
View File

@ -5,10 +5,13 @@
// James Turk (jpt2433@rit.edu) // James Turk (jpt2433@rit.edu)
// //
// Version: // Version:
// $Id: filesys.cpp,v 1.2 2005/02/07 01:48:51 cozman Exp $ // $Id: filesys.cpp,v 1.3 2005/02/13 22:12:03 cozman Exp $
// //
// Revisions: // Revisions:
// $Log: filesys.cpp,v $ // $Log: filesys.cpp,v $
// Revision 1.3 2005/02/13 22:12:03 cozman
// .h->.hpp
//
// Revision 1.2 2005/02/07 01:48:51 cozman // Revision 1.2 2005/02/07 01:48:51 cozman
// fixed several issues in testing // fixed several issues in testing
// //
@ -18,7 +21,7 @@
// //
#include "util/filesys/filesys.h" #include "util/filesys/filesys.hpp"
namespace photon namespace photon
{ {