diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h index 6455af68c..1c3eea8bc 100644 --- a/src/framework/Dynamic/FactoryHolder.h +++ b/src/framework/Dynamic/FactoryHolder.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h index f975ec6dd..9e9121418 100644 --- a/src/framework/Dynamic/ObjectRegistry.h +++ b/src/framework/Dynamic/ObjectRegistry.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h index 8379f1a20..8d2751e9a 100644 --- a/src/framework/GameSystem/Grid.h +++ b/src/framework/GameSystem/Grid.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/GameSystem/GridLoader.h b/src/framework/GameSystem/GridLoader.h index 1aa1af06a..e73913638 100644 --- a/src/framework/GameSystem/GridLoader.h +++ b/src/framework/GameSystem/GridLoader.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/GameSystem/GridRefManager.h b/src/framework/GameSystem/GridRefManager.h index f1e3bf6b5..cf9d4207f 100644 --- a/src/framework/GameSystem/GridRefManager.h +++ b/src/framework/GameSystem/GridRefManager.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h index df491d3d9..afd118c7f 100644 --- a/src/framework/GameSystem/GridReference.h +++ b/src/framework/GameSystem/GridReference.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h index 569d2312f..60fcbaaa8 100644 --- a/src/framework/GameSystem/NGrid.h +++ b/src/framework/GameSystem/NGrid.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify @@ -65,7 +65,7 @@ class MANGOS_DLL_DECL NGrid public: typedef Grid GridType; - NGrid(uint32 id, int32 x, int32 y, time_t expiry, bool unload = true) : + NGrid(uint32 id, int32 x, int32 y, time_t expiry, bool unload = true) : i_gridId(id), i_cellstate(GRID_STATE_INVALID), i_x(x), i_y(y), i_GridObjectDataLoaded(false) { i_GridInfo = GridInfo(expiry, unload); diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h index 685b80640..849a33385 100644 --- a/src/framework/GameSystem/TypeContainer.h +++ b/src/framework/GameSystem/TypeContainer.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/GameSystem/TypeContainerFunctions.h b/src/framework/GameSystem/TypeContainerFunctions.h index 1dd7c7a0a..1e6685f32 100644 --- a/src/framework/GameSystem/TypeContainerFunctions.h +++ b/src/framework/GameSystem/TypeContainerFunctions.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/GameSystem/TypeContainerFunctionsPtr.h b/src/framework/GameSystem/TypeContainerFunctionsPtr.h index 2076f8e3a..3673668e5 100644 --- a/src/framework/GameSystem/TypeContainerFunctionsPtr.h +++ b/src/framework/GameSystem/TypeContainerFunctionsPtr.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h index 8f947bdad..b6e8da9c6 100644 --- a/src/framework/GameSystem/TypeContainerVisitor.h +++ b/src/framework/GameSystem/TypeContainerVisitor.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Makefile.am b/src/framework/Makefile.am index 66680536b..4d064cefc 100644 --- a/src/framework/Makefile.am +++ b/src/framework/Makefile.am @@ -23,42 +23,41 @@ AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(srcdir) ## Build MaNGOS framework library as convenience library. # libMaNGOSScript shared library will later be reused by world server daemon. -noinst_LIBRARIES = libmangosframework.a +noinst_LIBRARIES = libmangosframework.a libmangosframework_a_SOURCES = \ - Policies/ObjectLifeTime.cpp \ - Utilities/EventProcessor.cpp + Policies/ObjectLifeTime.cpp \ + Utilities/EventProcessor.cpp ## Additional files to include when running 'make dist' # Source and header files for the Framework. EXTRA_DIST = \ - Dynamic/FactoryHolder.h \ - Dynamic/ObjectRegistry.h \ - GameSystem/Grid.h \ - GameSystem/GridLoader.h \ - GameSystem/GridRefManager.h \ - GameSystem/GridReference.h \ - GameSystem/NGrid.h \ - GameSystem/TypeContainer.h \ - GameSystem/TypeContainerFunctions.h \ - GameSystem/TypeContainerFunctionsPtr.h \ - GameSystem/TypeContainerVisitor.h \ - Network/SocketDefines.h \ - Platform/CompilerDefs.h \ - Platform/Define.h \ - Policies/CreationPolicy.h \ - Policies/ObjectLifeTime.h \ - Policies/Singleton.h \ - Policies/SingletonImp.h \ - Policies/ThreadingModel.h \ - Utilities/CountedReference/Reference.h \ - Utilities/CountedReference/ReferenceHolder.h \ - Utilities/CountedReference/ReferenceImpl.h \ - Utilities/LinkedReference/RefManager.h \ - Utilities/LinkedReference/Reference.h \ - Utilities/ByteConverter.h \ - Utilities/Callback.h \ - Utilities/EventProcessor.h \ - Utilities/HashMap.h \ - Utilities/LinkedList.h \ - Utilities/TypeList.h - + Dynamic/FactoryHolder.h \ + Dynamic/ObjectRegistry.h \ + GameSystem/Grid.h \ + GameSystem/GridLoader.h \ + GameSystem/GridRefManager.h \ + GameSystem/GridReference.h \ + GameSystem/NGrid.h \ + GameSystem/TypeContainer.h \ + GameSystem/TypeContainerFunctions.h \ + GameSystem/TypeContainerFunctionsPtr.h \ + GameSystem/TypeContainerVisitor.h \ + Network/SocketDefines.h \ + Platform/CompilerDefs.h \ + Platform/Define.h \ + Policies/CreationPolicy.h \ + Policies/ObjectLifeTime.h \ + Policies/Singleton.h \ + Policies/SingletonImp.h \ + Policies/ThreadingModel.h \ + Utilities/CountedReference/Reference.h \ + Utilities/CountedReference/ReferenceHolder.h \ + Utilities/CountedReference/ReferenceImpl.h \ + Utilities/LinkedReference/RefManager.h \ + Utilities/LinkedReference/Reference.h \ + Utilities/ByteConverter.h \ + Utilities/Callback.h \ + Utilities/EventProcessor.h \ + Utilities/HashMap.h \ + Utilities/LinkedList.h \ + Utilities/TypeList.h diff --git a/src/framework/Network/SocketDefines.h b/src/framework/Network/SocketDefines.h index 495778e0b..2d82f8e05 100644 --- a/src/framework/Network/SocketDefines.h +++ b/src/framework/Network/SocketDefines.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Platform/CompilerDefs.h b/src/framework/Platform/CompilerDefs.h index 6f75205df..3d88bbcec 100644 --- a/src/framework/Platform/CompilerDefs.h +++ b/src/framework/Platform/CompilerDefs.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h index 31435d1e8..5010cb7c9 100644 --- a/src/framework/Platform/Define.h +++ b/src/framework/Platform/Define.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify @@ -29,21 +29,21 @@ All rights reserved. TERMS -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted subject to the following conditions: -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. -3. The copyright holder's name must not be used to endorse or promote -any products derived from this software without his specific prior -written permission. +3. The copyright holder's name must not be used to endorse or promote +any products derived from this software without his specific prior +written permission. -This software is provided 'as is' with no express or implied warranties +This software is provided 'as is' with no express or implied warranties of correctness or fitness for purpose. ------------------------------------------------------------------------- */ @@ -79,11 +79,11 @@ of correctness or fitness for purpose. /* 2. BYTE ORDER IN 32-BIT WORDS -To obtain the highest speed on processors with 32-bit words, this code +To obtain the highest speed on processors with 32-bit words, this code needs to determine the order in which bytes are packed into such words. -The following block of code is an attempt to capture the most obvious -ways in which various environemnts specify their endian definitions. -It may well fail, in which case the definitions will need to be set by +The following block of code is an attempt to capture the most obvious +ways in which various environemnts specify their endian definitions. +It may well fail, in which case the definitions will need to be set by editing at the points marked **** EDIT HERE IF NECESSARY **** below. */ @@ -100,7 +100,7 @@ editing at the points marked **** EDIT HERE IF NECESSARY **** below. # define MANGOS_ENDIAN MANGOS_BIGENDIAN # endif # endif -# elif defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) +# elif defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) # define MANGOS_ENDIAN MANGOS_LITTLEENDIAN # elif !defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN) # define MANGOS_ENDIAN MANGOS_BIGENDIAN @@ -114,7 +114,7 @@ editing at the points marked **** EDIT HERE IF NECESSARY **** below. # define MANGOS_ENDIAN MANGOS_BIGENDIAN # endif # endif -# elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) +# elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) # define MANGOS_ENDIAN MANGOS_LITTLE_ENDIAN # elif !defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN) # define MANGOS_ENDIAN MANGOS_BIGENDIAN diff --git a/src/framework/Policies/CreationPolicy.h b/src/framework/Policies/CreationPolicy.h index 6f187ec99..43312d130 100644 --- a/src/framework/Policies/CreationPolicy.h +++ b/src/framework/Policies/CreationPolicy.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Policies/ObjectLifeTime.cpp b/src/framework/Policies/ObjectLifeTime.cpp index df85f4e41..0bbb0e4e2 100644 --- a/src/framework/Policies/ObjectLifeTime.cpp +++ b/src/framework/Policies/ObjectLifeTime.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h index f63b05a42..f93283dde 100644 --- a/src/framework/Policies/ObjectLifeTime.h +++ b/src/framework/Policies/ObjectLifeTime.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h index aea45b982..2f77a1d16 100644 --- a/src/framework/Policies/Singleton.h +++ b/src/framework/Policies/Singleton.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Policies/SingletonImp.h b/src/framework/Policies/SingletonImp.h index da30f5a75..d0ff54f1d 100644 --- a/src/framework/Policies/SingletonImp.h +++ b/src/framework/Policies/SingletonImp.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Policies/ThreadingModel.h b/src/framework/Policies/ThreadingModel.h index d2cc24b55..9f8eddb30 100644 --- a/src/framework/Policies/ThreadingModel.h +++ b/src/framework/Policies/ThreadingModel.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/ByteConverter.h b/src/framework/Utilities/ByteConverter.h index 047c230af..f5cfa5998 100644 --- a/src/framework/Utilities/ByteConverter.h +++ b/src/framework/Utilities/ByteConverter.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/Callback.h b/src/framework/Utilities/Callback.h index 40f7896f4..d76bed2e8 100644 --- a/src/framework/Utilities/Callback.h +++ b/src/framework/Utilities/Callback.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/CountedReference/Reference.h b/src/framework/Utilities/CountedReference/Reference.h index a26abf1b3..c06a2eba3 100644 --- a/src/framework/Utilities/CountedReference/Reference.h +++ b/src/framework/Utilities/CountedReference/Reference.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/CountedReference/ReferenceHolder.h b/src/framework/Utilities/CountedReference/ReferenceHolder.h index 3d4d72570..821a240cc 100644 --- a/src/framework/Utilities/CountedReference/ReferenceHolder.h +++ b/src/framework/Utilities/CountedReference/ReferenceHolder.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/CountedReference/ReferenceImpl.h b/src/framework/Utilities/CountedReference/ReferenceImpl.h index d5abe759f..a1a7b352b 100644 --- a/src/framework/Utilities/CountedReference/ReferenceImpl.h +++ b/src/framework/Utilities/CountedReference/ReferenceImpl.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/EventProcessor.cpp b/src/framework/Utilities/EventProcessor.cpp index 2f37f53ff..65de7c1aa 100644 --- a/src/framework/Utilities/EventProcessor.cpp +++ b/src/framework/Utilities/EventProcessor.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/EventProcessor.h b/src/framework/Utilities/EventProcessor.h index e98e6243d..5d83c02a2 100644 --- a/src/framework/Utilities/EventProcessor.h +++ b/src/framework/Utilities/EventProcessor.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/HashMap.h b/src/framework/Utilities/HashMap.h index 6dd23d7db..7ae3ee71f 100644 --- a/src/framework/Utilities/HashMap.h +++ b/src/framework/Utilities/HashMap.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/LinkedList.h b/src/framework/Utilities/LinkedList.h index 4774920ee..7ca217fe7 100644 --- a/src/framework/Utilities/LinkedList.h +++ b/src/framework/Utilities/LinkedList.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/LinkedReference/RefManager.h b/src/framework/Utilities/LinkedReference/RefManager.h index 11e31f0d2..876c44119 100644 --- a/src/framework/Utilities/LinkedReference/RefManager.h +++ b/src/framework/Utilities/LinkedReference/RefManager.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/LinkedReference/Reference.h b/src/framework/Utilities/LinkedReference/Reference.h index a6778cc3a..03fce374e 100644 --- a/src/framework/Utilities/LinkedReference/Reference.h +++ b/src/framework/Utilities/LinkedReference/Reference.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify diff --git a/src/framework/Utilities/TypeList.h b/src/framework/Utilities/TypeList.h index 37b560071..a94e4a280 100644 --- a/src/framework/Utilities/TypeList.h +++ b/src/framework/Utilities/TypeList.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2008 MaNGOS * * This program is free software; you can redistribute it and/or modify