drop HACK_TO_REMOVE_DUPLICATE_ERROR

Change-Id: Ideb45b0a0300160499531ed01fe982f7bc8a0862
intel · Jun 23, 2020 · b0d0f39 · b0d0f39
1 parent 9c8f862
commit b0d0f39
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 27 deletions.
diff --git a/cpucounters.h b/cpucounters.h
@@ -506,17 +506,6 @@ typedef std::vector<uint64> eventGroup_t;
 
 class PerfVirtualControlRegister;
 
-/*
-#ifndef HACK_TO_REMOVE_DUPLICATE_ERROR
-template class PCM_API std::allocator<TopologyEntry>;
-template class PCM_API std::vector<TopologyEntry>;
-template class PCM_API std::allocator<CounterWidthExtender *>;
-template class PCM_API std::vector<CounterWidthExtender *>;
-template class PCM_API std::allocator<uint32>;
-template class PCM_API std::vector<uint32>;
-template class PCM_API std::allocator<char>;
-#endif
-*/
 /*!
         \brief CPU Performance Monitor
 

diff --git a/pcm-core.cpp b/pcm-core.cpp
@@ -16,7 +16,6 @@
 /*!     \file pcm-core.cpp
   \brief Example of using CPU counters: implements a performance counter monitoring utility for Intel Core, Offcore events
   */
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include <iostream>
 #ifdef _MSC_VER
 #define strtok_r strtok_s

diff --git a/pcm-iio.cpp b/pcm-iio.cpp
@@ -13,7 +13,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 // written by Patrick Lu,
 //            Aaron Cruz
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include "cpucounters.h"
 #ifdef _MSC_VER
 #pragma warning(disable : 4996) // for sprintf

diff --git a/pcm-latency.cpp b/pcm-latency.cpp
@@ -12,7 +12,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 //
 // written by Subhiksha Ravisundar
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include "cpucounters.h"
 #ifdef _MSC_VER
 #pragma warning(disable : 4996) // for sprintf

diff --git a/pcm-lspci.cpp b/pcm-lspci.cpp
@@ -12,7 +12,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 
 // written by Patrick Lu
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include "cpucounters.h"
 #ifdef _MSC_VER
 #pragma warning(disable : 4996) // for sprintf

diff --git a/pcm-memory.cpp b/pcm-memory.cpp
@@ -18,7 +18,6 @@
 /*!     \file pcm-memory.cpp
   \brief Example of using CPU counters: implements a performance counter monitoring utility for memory controller channels and DIMMs (ranks) + PMM memory traffic
   */
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include <iostream>
 #ifdef _MSC_VER
 #include <windows.h>

diff --git a/pcm-mmio.cpp b/pcm-mmio.cpp
@@ -12,7 +12,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 
 // written by Roman Dementiev
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include "cpucounters.h"
 #ifdef _MSC_VER
 #include <windows.h>

diff --git a/pcm-msr.cpp b/pcm-msr.cpp
@@ -12,7 +12,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 
 // written by Roman Dementiev
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include "cpucounters.h"
 #ifdef _MSC_VER
 #include <windows.h>

diff --git a/pcm-numa.cpp b/pcm-numa.cpp
@@ -16,7 +16,6 @@
 /*!     \file pcm-numa.cpp
   \brief Example of using CPU counters: implements a performance counter monitoring utility for NUMA (remote and local memory accesses counting). Example for programming offcore response events
 */
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include <iostream>
 #ifdef _MSC_VER
 #include <windows.h>

diff --git a/pcm-pcicfg.cpp b/pcm-pcicfg.cpp
@@ -12,7 +12,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 
 // written by Roman Dementiev
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include "cpucounters.h"
 #ifdef _MSC_VER
 #include <windows.h>

diff --git a/pcm-pcie.cpp b/pcm-pcie.cpp
@@ -18,7 +18,6 @@
 /*!     \file pcm-pcie.cpp
   \brief Example of using uncore CBo counters: implements a performance counter monitoring utility for monitoring PCIe bandwidth
   */
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #ifdef _MSC_VER
 #include <windows.h>
 #include "../PCM_Win/windriver.h"
@@ -273,4 +272,4 @@ int main(int argc, char * argv[])
     // ================================== End Printing Output ==================================
 
     exit(EXIT_SUCCESS);
-}
+}
diff --git a/pcm-power.cpp b/pcm-power.cpp
@@ -14,7 +14,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 // written by Roman Dementiev
 // added PPD cycles by Thomas Willhalm
 
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include "cpucounters.h"
 #ifdef _MSC_VER
 #include <windows.h>

diff --git a/pcm-sensor.cpp b/pcm-sensor.cpp
@@ -22,7 +22,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 /*!     \file pcm-sensor.cpp
         \brief Example of using CPU counters: implements a graphical plugin for KDE ksysguard
 */
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include <iostream>
 #include <string>
 #include <sstream>

diff --git a/pcm-tsx.cpp b/pcm-tsx.cpp
@@ -16,7 +16,6 @@
 /*!     \file pcm-tsx.cpp
   \brief Example of using CPU counters: implements a performance counter monitoring utility for Intel Transactional Synchronization Extensions
   */
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include <iostream>
 #ifdef _MSC_VER
 #include <windows.h>

diff --git a/pcm.cpp b/pcm.cpp
@@ -18,7 +18,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 /*!     \file pcm.cpp
 \brief Example of using CPU counters: implements a simple performance counter monitoring utility
 */
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include <iostream>
 #ifdef _MSC_VER
 #include <windows.h>

diff --git a/realtime.cpp b/realtime.cpp
@@ -13,7 +13,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 // written by Roman Dementiev
 //
 
-#define HACK_TO_REMOVE_DUPLICATE_ERROR
 #include "cpucounters.h"
 #include "cpuasynchcounter.h"
 #include <iostream>