Advertisement
Guest User

Untitled

a guest
Nov 16th, 2019
147
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.54 KB | None | 0 0
  1. diff --git a/panda/src/express/pointerToArray.I b/panda/src/express/pointerToArray.I
  2. index 5fb560b69..08b881efe 100644
  3. --- a/panda/src/express/pointerToArray.I
  4. +++ b/panda/src/express/pointerToArray.I
  5. @@ -296,8 +296,7 @@ erase(iterator first, iterator last) {
  6.    nassertv(last >= ((To *)(this->_void_ptr))->begin() && last <= ((To *)(this->_void_ptr))->end());
  7.    ((To *)(this->_void_ptr))->erase(first, last);
  8.  }
  9. -
  10. -#if !defined(WIN32_VC) && !defined(WIN64_VC)
  11. +#if !defined(_WIN32)
  12.  /**
  13.   *
  14.   */
  15. @@ -844,7 +843,7 @@ back() const {
  16.    return ((To *)(this->_void_ptr))->back();
  17.  }
  18.  
  19. -#if !defined(WIN32_VC) && !defined(WIN64_VC)
  20. +#if !defined(_WIN32)
  21.  /**
  22.   *
  23.   */
  24. diff --git a/panda/src/express/pointerToArray.h b/panda/src/express/pointerToArray.h
  25. index 7ff07a5ef..1ed25282f 100644
  26. --- a/panda/src/express/pointerToArray.h
  27. +++ b/panda/src/express/pointerToArray.h
  28. @@ -61,7 +61,7 @@
  29.  
  30.  #include "pointerToArrayBase.h"
  31.  
  32. -#if (defined(WIN32_VC) || defined(WIN64_VC)) && !defined(__INTEL_COMPILER)
  33. +#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
  34.  // disable mysterious MSVC warning for static inline PTA::empty_array method
  35.  // need to chk if vc 7.0 still has this problem, would like to keep it enabled
  36.  #pragma warning (disable : 4506)
  37. @@ -179,7 +179,7 @@ public:
  38.    INLINE void erase(iterator position);
  39.    INLINE void erase(iterator first, iterator last);
  40.  
  41. -#if !defined(WIN32_VC) && !defined (WIN64_VC)
  42. +#if !defined(_WIN32)
  43.    INLINE reference operator [](size_type n) const;
  44.    INLINE reference operator [](int n) const;
  45.  #endif
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement