TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

general: Resolve some warnings unique to Windows

Browse Source
This commit is contained in:
Sam Edwards 2018-06-10 01:38:43 -06:00
parent 3c6ebb56bd
commit bc596797a3
6 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dtool/src/prc/configPageManager.cxx
View File

@ -13,6 +13,7 @@
#include "configPageManager.h" #include "configPageManager.h"
#include "configDeclaration.h" #include "configDeclaration.h"
#include "configVariableBool.h"
#include "configVariableString.h" #include "configVariableString.h"
#include "configPage.h" #include "configPage.h"
#include "prcKeyRegistry.h" #include "prcKeyRegistry.h"

15
panda/src/chan/animChannel.I
View File

@ -60,21 +60,6 @@ INLINE AnimChannel<SwitchType>::
~AnimChannel() { ~AnimChannel() {
} }
#if defined(WIN32_VC) || defined(WIN64_VC)
/**
* Gets the value of the channel at the indicated frame. This is a pure
* virtual function and normally would not need a function body, except that
* VC++ seems to be unhappy about instantiating the template without it.
*
* However, GCC seems to get confused when it *is* defined. So this whole
* thing is protected within an ifdef.
*/
template<class SwitchType>
void AnimChannel<SwitchType>::
get_value(int, typename AnimChannel<SwitchType>::ValueType &) {
}
#endif
/** /**
* Returns the value associated with the current frame, with no scale or share * Returns the value associated with the current frame, with no scale or share
* components. This only makes sense for a matrix-type channel, although for * components. This only makes sense for a matrix-type channel, although for

6
panda/src/express/checksumHashGenerator.I
View File

@ -11,6 +11,12 @@
* @date 2001-05-14 * @date 2001-05-14
*/ */
#ifdef _WIN32
// Needed for PtrToLong, below
#define WIN32_LEAN_AND_MEAN 1
#include <windows.h>
#endif
/** /**
* Adds another integer to the hash so far. This function should be * Adds another integer to the hash so far. This function should be
* overridden in base classes; this is the principle implementation of the * overridden in base classes; this is the principle implementation of the

2
panda/src/wgldisplay/wglGraphicsPipe.cxx
View File

@ -18,8 +18,6 @@
#include "wglGraphicsBuffer.h" #include "wglGraphicsBuffer.h"
#include "wglGraphicsStateGuardian.h" #include "wglGraphicsStateGuardian.h"
typedef enum {Software, MCD, ICD} OGLDriverType;
TypeHandle wglGraphicsPipe::_type_handle; TypeHandle wglGraphicsPipe::_type_handle;
bool wglGraphicsPipe::_current_valid; bool wglGraphicsPipe::_current_valid;
HDC wglGraphicsPipe::_current_hdc; HDC wglGraphicsPipe::_current_hdc;

2
panda/src/wgldisplay/wglGraphicsWindow.cxx
View File

@ -357,7 +357,7 @@ setup_colormap(const PIXELFORMATDESCRIPTOR &pixelformat) {
#ifdef NOTIFY_DEBUG #ifdef NOTIFY_DEBUG
// typedef enum {Software, MCD, ICD} OGLDriverType; typedef enum {Software, MCD, ICD} OGLDriverType;
static const char *OGLDrvStrings[3] = {"Software","MCD","ICD"}; static const char *OGLDrvStrings[3] = {"Software","MCD","ICD"};
/** /**

1
panda/src/windisplay/winGraphicsPipe.cxx
View File

@ -48,7 +48,6 @@ typedef long (__stdcall *CallNtPowerInformationType) (POWER_INFORMATION_LEVEL in
static int initialize = false; static int initialize = false;
static HMODULE psapi_dll = 0; static HMODULE psapi_dll = 0;
static HMODULE power_dll = 0;
static GetProcessMemoryInfoType GetProcessMemoryInfoFunction = 0; static GetProcessMemoryInfoType GetProcessMemoryInfoFunction = 0;
static CallNtPowerInformationType CallNtPowerInformationFunction = 0; static CallNtPowerInformationType CallNtPowerInformationFunction = 0;